summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/terminal.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d84764f..551c7871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-05 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 514661 – crash launching g-t with specific args
+
+ * src/terminal.c (option_command_callback): Set err to NULL before
+ calling into GError-taking API.
+
2008-02-05 Christian Persch <chpe@gnome.org>
* src/terminal-screen.c: (terminal_screen_class_init),
diff --git a/src/terminal.c b/src/terminal.c
index 45caeb7e..664c322f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -360,6 +360,7 @@ option_command_callback (const gchar *option_name,
error = NULL;
exec_argv = NULL;
+ err = NULL;
if (!g_shell_parse_argv (value, NULL, &exec_argv, &err))
{
g_set_error(error,