[Cluster-devel] cluster/rgmanager/src/daemons rg_thread.c

[lhh@sourceware.org <lhh@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2006-11-27 22:33:04

Modified files:
	rgmanager/src/daemons: rg_thread.c 

Log message:
	Fix #213878 - segfault in rg_thread.c due to improper loop semantics

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_thread.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15&r2=1.15.2.1

--- cluster/rgmanager/src/daemons/rg_thread.c	2006/09/27 18:58:53	1.15
+++ cluster/rgmanager/src/daemons/rg_thread.c	2006/11/27 22:33:04	1.15.2.1
@@ -111,18 +111,22 @@
 purge_status_checks(request_t **list)
 {
 	request_t *curr;
+	int found;
 	
 	if (!list)
 		return;
 
-	list_do(list, curr) {
-		if (curr->rr_request != RG_STATUS)
-			continue;
-
-		list_remove(list, curr);
-		rq_free(curr);
-		curr = *list;
-	} while (!list_done(list, curr));
+	do {
+		found = 0;
+		list_do(list, curr) {
+			if (curr->rr_request == RG_STATUS) {
+				list_remove(list, curr);
+				rq_free(curr);
+				found = 1;
+				break;
+			}
+		} while (!list_done(list, curr));
+	} while (found);
 }