r22053 - in /desktop/unstable/libsoup2.4/debian: changelog control patches/sqlite_strcmp_null_string.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Oct 22 14:59:15 2009
New Revision: 22053

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22053
Log:
* debian/patches/sqlite_strcmp_null_string.patch:
  - Backport change from git to fix a crash if some values in the sqlite
    database are null.

Added:
    desktop/unstable/libsoup2.4/debian/patches/sqlite_strcmp_null_string.patch
Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/control

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=22053&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog [utf-8] Thu Oct 22 14:59:15 2009
@@ -1,3 +1,11 @@
+libsoup2.4 (2.28.1-2) unstable; urgency=low
+
+  * debian/patches/sqlite_strcmp_null_string.patch:
+    - Backport change from git to fix a crash if some values in the sqlite
+      database are null.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 22 Oct 2009 16:54:59 +0200
+
 libsoup2.4 (2.28.1-1) unstable; urgency=low
 
   * New upstream bugfix release:

Modified: desktop/unstable/libsoup2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/control?rev=22053&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/control [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/control [utf-8] Thu Oct 22 14:59:15 2009
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5),
                libgconf2-dev,
                libglib2.0-dev (>= 2.21.3),

Added: desktop/unstable/libsoup2.4/debian/patches/sqlite_strcmp_null_string.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/patches/sqlite_strcmp_null_string.patch?rev=22053&op=file
==============================================================================
--- desktop/unstable/libsoup2.4/debian/patches/sqlite_strcmp_null_string.patch (added)
+++ desktop/unstable/libsoup2.4/debian/patches/sqlite_strcmp_null_string.patch [utf-8] Thu Oct 22 14:59:15 2009
@@ -1,0 +1,30 @@
+From e465b10708fe091d6d6dd974b95b6fb74351ee23 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Thu, 22 Oct 2009 16:28:13 +0200
+Subject: [PATCH] Don't crash if the sqlite database lacks some values
+
+Right now we strcmp() the isSecure and isHttpOnly values,
+but if they are missing we will crash since strcmp() is
+not NULL safe. Use g_strcmp0() instead.
+---
+ libsoup/soup-cookie-jar-sqlite.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/soup-cookie-jar-sqlite.c b/libsoup/soup-cookie-jar-sqlite.c
+index f782cb3..8114f17 100644
+--- a/libsoup/soup-cookie-jar-sqlite.c
++++ b/libsoup/soup-cookie-jar-sqlite.c
+@@ -207,8 +207,8 @@ callback (void *data, int argc, char **argv, char **colname)
+ 	if (max_age <= 0)
+ 		return 0;
+ 
+-	http_only = (strcmp (argv[COL_HTTP_ONLY], "1") == 0);
+-	secure = (strcmp (argv[COL_SECURE], "1") == 0);
++	http_only = (g_strcmp0 (argv[COL_HTTP_ONLY], "1") == 0);
++	secure = (g_strcmp0 (argv[COL_SECURE], "1") == 0);
+ 
+ 	cookie = soup_cookie_new (name, value, host, path, max_age);
+ 
+-- 
+1.6.5
+