r21320 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/11_fix_crash_in_profile_migration.patch patches/series

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Sep 11 13:28:32 2009
New Revision: 21320

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21320
Log:
New patch to avoid crashing on startup in some cases

Added:
    desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch
Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/patches/series

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21320&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Fri Sep 11 13:28:32 2009
@@ -1,3 +1,10 @@
+epiphany-webkit (2.27.92-3) UNRELEASED; urgency=low
+
+  * debian/patches/11_fix_crash_in_profile_migration.patch:
+  - patch from upstream, to avoid crashing on startup
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Fri, 11 Sep 2009 10:26:55 -0300
+
 epiphany-webkit (2.27.92-2) experimental; urgency=low
 
   * debian/control.in:

Added: desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch?rev=21320&op=file
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch (added)
+++ desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch [utf-8] Fri Sep 11 13:28:32 2009
@@ -1,0 +1,42 @@
+commit f433ee264428a8289aa6f6ea45e1efd317a39e87
+Author: Xan Lopez <xan at gnome.org>
+Date:   Thu Sep 10 12:54:27 2009 +0300
+
+    ephy-profile-migration.c: fix crash when importing some profiles
+    
+    Be more careful about not going over the end of the lines array.
+    
+    Bug #594717
+
+diff --git a/src/ephy-profile-migration.c b/src/ephy-profile-migration.c
+index 3acf606..8308915 100644
+--- a/src/ephy-profile-migration.c
++++ b/src/ephy-profile-migration.c
+@@ -152,6 +152,7 @@ parse_and_decrypt_signons (const char *signons)
+   int version;
+   gchar **lines;
+   int i;
++  guint length;
+ 
+   lines = g_strsplit (signons, "\r\n", -1);
+   if (!g_ascii_strncasecmp (lines[0], "#2c", 3))
+@@ -175,7 +176,9 @@ parse_and_decrypt_signons (const char *signons)
+    * separated by lines that only contain a dot. We find a block by
+    * the separator and parse them one by one.
+    */
+-  while (lines[i]) {
++  length = g_strv_length (lines);
++
++  while (i < length) {
+     size_t begin = i;
+     size_t end = i + 1;
+     const char *realmBracketBegin = " (";
+@@ -268,7 +271,7 @@ parse_and_decrypt_signons (const char *signons)
+       if (version >= 2) {
+         if (begin < end)
+           /* Skip it */ ;
+-        begin ++;
++        begin++;
+ 
+         /* Version 3 has an extra line for further use */
+         if (version == 3)

Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=21320&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] Fri Sep 11 13:28:32 2009
@@ -7,6 +7,7 @@
 07_bookmarks.patch
 09_download_dialog.patch
 10_smart_bookmarks.patch
+11_fix_crash_in_profile_migration.patch
 12_safetypes.patch
 14_webkit_temporary_gconf_rename.patch
 15_webkit_temporary_gettext_domain_rename.patch