From 047a7f8cf31e217249ee88b104fe8c43b3ebb2b7 Mon Sep 17 00:00:00 2001 From: Martin Schaaf Date: Wed, 22 Dec 2004 08:00:51 +0000 Subject: [PATCH] 2004-12-22 [martin] 0.9.13cvs21.2 * src/action.c free the command line after its use --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/action.c | 6 +++--- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index ee7612b22..64c016344 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-12-22 [martin] 0.9.13cvs21.2 + + * src/action.c + free the command line after its use + 2004-12-18 [paul] 0.9.13cvs21.1 * AUTHORS diff --git a/PATCHSETS b/PATCHSETS index 97196c412..31f0ea87f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -290,3 +290,4 @@ ( cvs diff -u -r 1.396.2.15 -r 1.396.2.16 ChangeLog; cvs diff -u -r 1.391.2.15 -r 1.391.2.16 ChangeLog.jp; cvs diff -u -r 1.2504.2.38 -r 1.2504.2.39 ChangeLog.claws; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/action.c; cvs diff -u -r 1.36.2.17 -r 1.36.2.18 src/common/utils.c; cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/gtk/prefswindow.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/gtk/gtkutils.h; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/plugins/spamassassin/libspamc.c; ) > 0.9.13cvs17.1.patchset ( cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/action.c; cvs diff -u -r 1.149.2.17 -r 1.149.2.18 src/inc.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/select-keys.c; ) > 0.9.13cvs17.2.patchset ( cvs diff -u -r 1.100.2.8 -r 1.100.2.9 AUTHORS; cvs diff -u -r 1.396.2.16 -r 1.396.2.17 ChangeLog; cvs diff -u -r 1.2504.2.39 -r 1.2504.2.40 ChangeLog.claws; cvs diff -u -r 1.391.2.16 -r 1.391.2.17 ChangeLog.jp; cvs diff -u -r 1.42.2.6 -r 1.42.2.7 NEWS; cvs diff -u -r 1.654.2.324 -r 1.654.2.325 configure.ac; cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/action.c; cvs diff -u -r 1.382.2.80 -r 1.382.2.81 src/compose.c; cvs diff -u -r 1.16 -r 1.17 src/syldap.c; ) > 0.9.13cvs21.1.patchset +( cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/action.c; ) > 0.9.13cvs21.2.patchset diff --git a/configure.ac b/configure.ac index 0d63d797c..733392ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=21 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.1 +EXTRA_GTK2_VERSION=.2 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/action.c b/src/action.c index 436ca4050..73e7e2eb2 100644 --- a/src/action.c +++ b/src/action.c @@ -841,15 +841,15 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str, ret_str = g_locale_from_utf8(cmd, strlen(cmd), &by_read, &by_written, NULL); - if (ret_str && by_written) { + if (ret_str && by_written) cmdline[2] = ret_str; - g_free(ret_str); - } else + else cmdline[2] = cmd; cmdline[3] = NULL; execvp("/bin/sh", cmdline); perror("execvp"); + g_free(ret_str); _exit(1); } else if (gch_pid < (pid_t) 0) { /* Fork error */ if (sync) -- 2.25.1