[Galago-commits] r2591 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-27 01:43:07 -0800 (Mon, 27 Feb 2006)
New Revision: 2591

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-context.c
Log:
Fix a segfault due to a recent change. We were strcmp'ing against old_id, which is NULL the first time.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-02-27 09:38:18 UTC (rev 2590)
+++ trunk/libgalago/ChangeLog	2006-02-27 09:43:07 UTC (rev 2591)
@@ -1,3 +1,9 @@
+Sun Feb 26 19:37:48 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-context.c:
+	  - Fix a segfault due to a recent change. We were strcmp'ing against
+	    old_id, which is NULL the first time.
+
 Sun Feb 26 19:34:40 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* po/da.po:

Modified: trunk/libgalago/libgalago/galago-context.c
===================================================================
--- trunk/libgalago/libgalago/galago-context.c	2006-02-27 09:38:18 UTC (rev 2590)
+++ trunk/libgalago/libgalago/galago-context.c	2006-02-27 09:43:07 UTC (rev 2591)
@@ -472,7 +472,7 @@
 	const char *old_id = g_object_get_data(G_OBJECT(person),
 										   "_galago_old_id");
 
-	if (!strcmp(id, old_id))
+	if (old_id != NULL && !strcmp(id, old_id))
 		return;
 
 	remove_person_from_table(person);