hal/hald util.c,1.27,1.28

Danny Kukawka dkukawka at freedesktop.org
Fri Oct 21 02:26:01 PDT 2005


Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv30443/hald

Modified Files:
	util.c 
Log Message:
2005-10-21  Danny Kukawka  <danny.kukawka at web.de>

        * hald/util.c: (callout_failed): This patch fix possible segfault if
        the callout of a non-existing addon from key info.addons fails.



Index: util.c
===================================================================
RCS file: /cvs/hal/hal/hald/util.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- util.c	27 Sep 2005 09:42:12 -0000	1.27
+++ util.c	21 Oct 2005 09:25:59 -0000	1.28
@@ -1077,11 +1077,13 @@
 static void
 callout_failed (HalHelperData *ed)
 {
-	Callout *c;
-	c = (Callout *) ed->data1;
+	if (ed->data1 != NULL) {
+		Callout *c;
+		c = (Callout *) ed->data1;
 
-	c->next_program++;
-	callout_do_next(c);
+		c->next_program++;
+		callout_do_next(c);
+	}
 }
 
 static void 




More information about the hal-commit mailing list