r31974 - in /packages/unstable/libgksu/debian: changelog patches/02_format-security.patch

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Dec  7 10:04:22 2011
New Revision: 31974

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31974
Log:
debian/patches/02_format-security.patch: The previous fix exposed a logic
flaw which caused a NULL pointer crash if calling sudo was successful. Fix
this. (LP: #898874)

Modified:
    packages/unstable/libgksu/debian/changelog
    packages/unstable/libgksu/debian/patches/02_format-security.patch

Modified: packages/unstable/libgksu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/changelog?rev=31974&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/changelog [utf-8] (original)
+++ packages/unstable/libgksu/debian/changelog [utf-8] Wed Dec  7 10:04:22 2011
@@ -1,8 +1,11 @@
 libgksu (2.0.13~pre1-6) UNRELEASED; urgency=low
 
   * debian/control.in: Fix Vcs-* URL.
-
- -- Michael Biebl <biebl at debian.org>  Wed, 07 Dec 2011 10:57:37 +0100
+  * debian/patches/02_format-security.patch: The previous fix exposed a logic
+    flaw which caused a NULL pointer crash if calling sudo was successful. Fix
+    this. (LP: #898874)
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 07 Dec 2011 10:57:37 +0100
 
 libgksu (2.0.13~pre1-5) unstable; urgency=low
 

Modified: packages/unstable/libgksu/debian/patches/02_format-security.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/patches/02_format-security.patch?rev=31974&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/patches/02_format-security.patch [utf-8] (original)
+++ packages/unstable/libgksu/debian/patches/02_format-security.patch [utf-8] Wed Dec  7 10:04:22 2011
@@ -3,8 +3,8 @@
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643423
 Index: libgksu-2.0.13~pre1/libgksu/libgksu.c
 ===================================================================
---- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c	2011-10-24 02:00:19.000000000 +0200
-+++ libgksu-2.0.13~pre1/libgksu/libgksu.c	2011-10-24 02:03:35.987931756 +0200
+--- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c	2011-12-07 11:01:18.351654566 +0100
++++ libgksu-2.0.13~pre1/libgksu/libgksu.c	2011-12-07 11:01:41.231654725 +0100
 @@ -1276,7 +1276,7 @@
    context->dir = g_strdup (mkdtemp(template));
    if (!context->dir)
@@ -23,12 +23,17 @@
  	      g_free (emsg);
  
  	      if (context->debug)
-@@ -2979,7 +2979,7 @@
+@@ -2979,8 +2979,11 @@
  	}
      }
  
 -  fprintf(stderr, child_stderr);
-+  fprintf(stderr, "%s", child_stderr);
-   g_free(child_stderr);
+-  g_free(child_stderr);
++  if (child_stderr != NULL)
++    {
++      fprintf(stderr, "%s", child_stderr);
++      g_free(child_stderr);
++    }
  
    /* if error is set we have found an error condition */
+   return (error == NULL);