r17177 - in /desktop/unstable/epiphany-browser/debian: changelog patches/19_passwords_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Sep 29 10:19:12 2008
New Revision: 17177

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17177
Log:
19_passwords_crash.patch: patch from upstream to fix crash when 
viewing passwords. Closes: #494348. The crash used to corrupt 
user preferences which triggered another crash, so it also
closes: #486136.

Added:
    desktop/unstable/epiphany-browser/debian/patches/19_passwords_crash.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=17177&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Mon Sep 29 10:19:12 2008
@@ -1,4 +1,4 @@
-epiphany-browser (2.22.3-4) UNRELEASED; urgency=low
+epiphany-browser (2.22.3-4) unstable; urgency=low
 
   [ Sam Morris ]
   * 18_gnome-vfs-for-helper-display.patch: Use gnome-vfs to display which
@@ -10,8 +10,12 @@
   [ Josselin Mouette ]
   * 14_zoom-crash.patch: patch from Mike Hommey to fix crash when 
     changing the zoom factor. Closes: #486744.
-
- -- Sam Morris <sam at robots.org.uk>  Sun, 14 Sep 2008 15:55:56 +0100
+  * 19_passwords_crash.patch: patch from upstream to fix crash when 
+    viewing passwords. Closes: #494348. The crash used to corrupt 
+    user preferences which triggered another crash, so it also
+    closes: #486136.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 29 Sep 2008 12:20:49 +0200
 
 epiphany-browser (2.22.3-3) unstable; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/19_passwords_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/19_passwords_crash.patch?rev=17177&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/19_passwords_crash.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/19_passwords_crash.patch Mon Sep 29 10:19:12 2008
@@ -1,0 +1,28 @@
+Debian #494348, probably also causes #486136
+GNOME #542383
+Upstream commits r8375 and r8376.
+
+Index: epiphany-2.22.3/embed/mozilla/mozilla-embed-single.cpp
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/mozilla-embed-single.cpp	2008-09-29 11:58:20.024332003 +0200
++++ epiphany-2.22.3/embed/mozilla/mozilla-embed-single.cpp	2008-09-29 12:05:55.732012936 +0200
+@@ -925,14 +925,17 @@ impl_list_passwords (EphyPasswordManager
+ 
+ #ifdef HAVE_GECKO_1_9
+ 	nsILoginInfo **logins = nsnull;
+-	PRUint32 count,i;
++	PRUint32 count = 0,i;
+ 	nsresult rv;
+ 
+ 	nsCOMPtr<nsILoginManager> loginManager =
+ 			do_GetService (NS_LOGINMANAGER_CONTRACTID);
+ 	NS_ENSURE_TRUE (loginManager, NULL);
+ 
+-	loginManager -> GetAllLogins(&count, &logins);
++	rv = loginManager -> GetAllLogins(&count, &logins);
++	if (NS_FAILED (rv))
++		return NULL;
++	NS_ENSURE_TRUE (logins, NULL);
+ 
+ 	for (i=0; i < count; i++) {
+ 		nsString transfer;

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=17177&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Mon Sep 29 10:19:12 2008
@@ -17,4 +17,5 @@
 16_fix-notify-uninit-crash.patch 
 17_print-scaling.patch
 18_gnome-vfs-for-helper-display.patch
+19_passwords_crash.patch
 99_autoreconf.patch