[ekg2-commit] r3874 - trunk/ekg: trunk/ekg/ekg.c trunk/ekg/sessions.c

[SVN commit]

Author: peres
Date: 2008-03-09 12:42:38 +0100 (Sun, 09 Mar 2008)
New Revision: 3874

Modified:
   trunk/ekg/ekg.c
   trunk/ekg/sessions.c
Log:

Stupid. Forgot that watch_free() can return NULL also if next==NULL x_X.



Modified: trunk/ekg/ekg.c
===================================================================
--- trunk/ekg/ekg.c	2008-03-09 11:05:08 UTC (rev 3873)
+++ trunk/ekg/ekg.c	2008-03-09 11:42:38 UTC (rev 3874)
@@ -1099,11 +1099,12 @@
 
 		for (w = watches; w;) {
 			watch_t *tmp;
+			watch_t *next = w->next;
 
 			if ((tmp = watch_free(w)))
-				w = tmp;
-			else
-				w = w->next;
+				next = tmp;
+
+			w = next;
 		}
 	}
 

Modified: trunk/ekg/sessions.c
===================================================================
--- trunk/ekg/sessions.c	2008-03-09 11:05:08 UTC (rev 3873)
+++ trunk/ekg/sessions.c	2008-03-09 11:42:38 UTC (rev 3874)
@@ -1469,11 +1469,12 @@
 
 		for (w = watches; w;) {
 			watch_t *tmp;
+			watch_t *next = w->next;
 
 			if (w->is_session && ((tmp = watch_free(w))))
-				w = tmp;
-			else
-				w = w->next;
+				next = tmp;
+
+			w = next;
 		}
 	}