r16970 - in /desktop/unstable/gnome-terminal/debian: changelog control patches/01_error_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Sep 17 10:23:34 2008
New Revision: 16970

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16970
Log:
01_error_crash.patch: stolen from upstream (r2948). Fixes crash when 
passing incorrect arguments to the command line. Closes: #477259.

Added:
    desktop/unstable/gnome-terminal/debian/patches/01_error_crash.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=16970&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog (original)
+++ desktop/unstable/gnome-terminal/debian/changelog Wed Sep 17 10:23:34 2008
@@ -1,3 +1,10 @@
+gnome-terminal (2.22.3-3) UNRELEASED; urgency=low
+
+  * 01_error_crash.patch: stolen from upstream (r2948). Fixes crash when 
+    passing incorrect arguments to the command line. Closes: #477259.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 17 Sep 2008 12:22:21 +0200
+
 gnome-terminal (2.22.3-2) unstable; urgency=low
 
   * gnome-terminal.wrapper: correctly emulate the completely brain-dead 

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=16970&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control (original)
+++ desktop/unstable/gnome-terminal/debian/control Wed Sep 17 10:23:34 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.8.0
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),

Added: desktop/unstable/gnome-terminal/debian/patches/01_error_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/01_error_crash.patch?rev=16970&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/01_error_crash.patch (added)
+++ desktop/unstable/gnome-terminal/debian/patches/01_error_crash.patch Wed Sep 17 10:23:34 2008
@@ -1,0 +1,17 @@
+--- trunk/src/terminal.c	2008/06/25 12:02:13	2929
++++ trunk/src/terminal.c	2008/07/06 21:56:09	2948
+@@ -287,12 +287,9 @@
+ {
+   OptionParsingResults *results = data;
+   InitialTab *it;
+-  GError *err;
+-  char   **exec_argv;
+-  error = NULL;
+-  exec_argv = NULL;
++  GError *err = NULL;
++  char  **exec_argv;
+ 
+-  err = NULL;
+   if (!g_shell_parse_argv (value, NULL, &exec_argv, &err))
+     {
+       g_set_error(error,