Changeset 143

Timestamp:

07/05/04 23:34:44 (9 years ago)

Author:

aprilp

Message:

* Fixed an endless loop in client_list_delete

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• src/client_list.c (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+2004-07-05 Philippe April <papril777@yahoo.com>
+    * Fixed an endless loop in client_list_delete
+
 2004-06-10 Alexandre Carmel-Veilleux <acv@acv.ca>
         * Added debugging to libhttpd so that httpdGetConnection() traces

trunk/wifidog/src/client_list.c

@@ -212 +212 @@
     ptr = firstclient;
 
-    if (ptr == client) {
+    if (ptr == NULL) {
+        debug(LOG_ERR, "Node list empty!");
+    } else if (ptr == client) {
         firstclient = ptr->next;
         _client_list_free_node(client);
     } else {
-        while (ptr->next != NULL && ptr != client) {
-            if (ptr->next == client) {
-                ptr->next = client->next;
-                _client_list_free_node(client);
-            }
+        /* Loop forward until we reach our point in the list. */
+        while (ptr->next != NULL && ptr->next != client) {
+            ptr = ptr->next;
         }
-    }
-}
-
-
+        /* If we reach the end before finding out element, complain. */
+        if (ptr->next == NULL) {
+            debug(LOG_ERR, "Node to delete could not be found.");
+        /* Free element. */
+        } else {
+            ptr->next = client->next;
+            _client_list_free_node(client);
+        }
+    }
+}