r45849 - in /desktop/experimental/gnome-keyring/debian: changelog patches/fix_test_import_segfault.patch patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Sun Sep  6 09:35:26 2015
New Revision: 45849

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45849
Log:
Fix segmentation fault in test-import (fix_test_import_segfault.patch).

Added:
    desktop/experimental/gnome-keyring/debian/patches/fix_test_import_segfault.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/patches/series

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=45849&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog	[utf-8] Sun Sep  6 09:35:26 2015
@@ -1,6 +1,7 @@
 gnome-keyring (3.17.91-2) UNRELEASED; urgency=medium
 
   * Replace Xvfb with dbus-run-session, it much better fits our needs.
+  * Fix segmentation fault in test-import (fix_test_import_segfault.patch).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 06 Sep 2015 12:30:14 +0300
 

Added: desktop/experimental/gnome-keyring/debian/patches/fix_test_import_segfault.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/fix_test_import_segfault.patch?rev=45849&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/fix_test_import_segfault.patch	(added)
+++ desktop/experimental/gnome-keyring/debian/patches/fix_test_import_segfault.patch	[utf-8] Sun Sep  6 09:35:26 2015
@@ -0,0 +1,15 @@
+Description: initialize error with NULL to fix segfault in test-import
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=731802#c7
+Last-Update: 2015-09-06
+
+--- a/pkcs11/gnome2-store/test-import.c
++++ b/pkcs11/gnome2-store/test-import.c
+@@ -132,6 +132,7 @@
+ 	gsize length;
+ 	GList *l;
+ 
++	error = NULL;
+ 	g_file_get_contents (SRCDIR "/pkcs11/gnome2-store/fixtures/personal.p12", &contents, &length, &error);
+ 	g_assert_no_error (error);
+ 

Modified: desktop/experimental/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/series?rev=45849&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/series	[utf-8] Sun Sep  6 09:35:26 2015
@@ -1 +1,2 @@
 03_kfreebsd.patch
+fix_test_import_segfault.patch