From 172ce0cb9dd3995fe154fe41de519f848f2c66de Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Thu, 10 Nov 2011 16:40:09 +0000 Subject: [PATCH] conn-olpc: handle activities with NULL ids. Other places in the code seem to handle GabbleOlpcActivity.id being NULL; and is a crash on this strcmp. There are no logs, and the first argument to strcmp is not on record, so this suggests to me that this might be the cause! --- src/conn-olpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conn-olpc.c b/src/conn-olpc.c index cac0413..8b3576b 100644 --- a/src/conn-olpc.c +++ b/src/conn-olpc.c @@ -3025,7 +3025,7 @@ find_activity_by_id (GabbleConnection *self, while (g_hash_table_iter_next (&iter, &key, &value)) { GabbleOlpcActivity *activity = GABBLE_OLPC_ACTIVITY (value); - if (strcmp (activity->id, activity_id) == 0) + if (!tp_strdiff (activity->id, activity_id)) return activity; } -- 1.7.7.1