diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-10 16:40:09 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-10 17:08:10 +0000 |
| commit | ebcb1350c3b316f8fe510caacacf0b2a59b95458 (patch) | |
| tree | 382e47caaa257c49cd07ec404902d58b0a85836c | |
| parent | 5677e158d6518e53bc06c131e3b2c8b9c779a74a (diff) | |
| download | telepathy-gabble-ebcb1350c3b316f8fe510caacacf0b2a59b95458.tar.gz | |
conn-olpc: handle activities with NULL ids.
Other places in the code seem to handle GabbleOlpcActivity.id being
NULL; and <https://bugs.freedesktop.org/show_bug.cgi?id=32050> 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!
| -rw-r--r-- | 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 cac0413a2..8b3576b2d 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; } |