Merge lp:~om26er/ubuntu/oneiric/empathy/fix-crashes into lp:~ubuntu-desktop/empathy/ubuntu

[Omer Akram]

empathy is crashing alot few nasty crashes are fixed in master so I backported a commit that should fix the two linked bugs. The main reason is to have Oneiric beta with a working empathy in case upstream version comes after our beta release.

[Marc Deslauriers (mdeslaur)]

Look good. ACK. Thanks!
Pending archive freeze exception approval, I'll upload it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-22 19:03:49 +0000
+++ debian/changelog	2011-08-24 17:25:23 +0000
@@ -1,3 +1,11 @@
+empathy (3.1.5.1-1ubuntu2) oneiric; urgency=low
+
+  * debian/patches/70_lp_832378.patch:
+    - empathy crashed with SIGSEGV in __memcpy_ssse3() (LP: #828802)
+    - empathy crashed with SIGSEGV in g_memdup() (LP: #832378)
+
+ -- Omer Akram <[e-mail]>  Wed, 24 Aug 2011 22:15:51 +0500
+
 empathy (3.1.5.1-1ubuntu1) oneiric; urgency=low
 
   * New upstream version

=== added file 'debian/patches/70_lp_832378.patch'
--- debian/patches/70_lp_832378.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/70_lp_832378.patch	2011-08-24 17:25:23 +0000
@@ -0,0 +1,30 @@
+From: Omer Akram <[e-mail]>
+Author: Guillaume Desmottes <[e-mail]>
+Subject: Don't crash if we failed to load the avatar.
+Origin: http://git.gnome.org/browse/empathy/commit/?id=f60338e75ad72300e1f93ea38ce17284d50d698c
+Bug: https://bugzilla.gnome.org/656829
+Bug-Ubuntu: https://launchpad.net/bugs/828802
+
+--- a/libempathy/empathy-contact.c
++++ b/libempathy/empathy-contact.c
+@@ -1811,8 +1811,17 @@ contact_set_avatar_from_tp_contact (EmpathyContact *contact)
+       gchar *data;
+       gsize len;
+       gchar *path;
++      GError *error = NULL;
++
++      if (!g_file_load_contents (file, NULL, &data, &len, NULL, &error))
++        {
++          DEBUG ("Failed to load avatar: %s", error->message);
++
++          g_error_free (error);
++          contact_set_avatar (contact, NULL);
++          return;
++        }
+ 
+-      g_file_load_contents (file, NULL, &data, &len, NULL, NULL);
+       path = g_file_get_path (file);
+ 
+       avatar = empathy_avatar_new ((guchar *) data, len, mime, path);
+-- 
+1.7.4.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-17 16:57:16 +0000
+++ debian/patches/series	2011-08-24 17:25:23 +0000
@@ -6,3 +6,4 @@
 37_facebook_default.patch
 38_lp_569289.patch
 41_unity_launcher_progress.patch
+70_lp_832378.patch