2004-11-23 [colin] 0.9.12cvs158.8

	* src/compose.c
		Fix possible double-free
		Spotted by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6d5a586bfce3b4bb77e09f52688e78f254d30926..de7b204421c3f816143eae5883860446c2b13ccf 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-11-23 [colin]     0.9.12cvs158.8
+
+       * src/compose.c
+               Fix possible double-free
+               Spotted by Alfons
+
 2004-11-23 [colin]     0.9.12cvs158.7
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 1cd131a7dbcc2a41f2ae002e85ae6eb2192a6d82..0b412b4834ff022999601dabf7cfc0c4b4c98d7c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -253,3 +253,4 @@
 ( cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_themes.c; ) > 0.9.12cvs158.5.patchset
 ( cvs diff -u -r 1.382.2.70 -r 1.382.2.71 src/compose.c; ) > 0.9.12cvs158.6.patchset
 ( cvs diff -u -r 1.382.2.71 -r 1.382.2.72 src/compose.c; ) > 0.9.12cvs158.7.patchset
+( cvs diff -u -r 1.382.2.72 -r 1.382.2.73 src/compose.c; ) > 0.9.12cvs158.8.patchset

diff --git a/configure.ac b/configure.ac
index b363248a6e0c30b03b2a0eeffd7aefef670475aa..f96dc3117b410f6e5fb7365f4db57eb40fdb854c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=158
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.7
+EXTRA_GTK2_VERSION=.8
 
 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/compose.c b/src/compose.c
index 993fb9e2e1453cf8b657cfc5e1678fcb4eb89121..7e9fe88d1caa5f5fd03efc729fed51c86b3f1c4e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6914,8 +6914,11 @@ static void compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
 {
        gchar *str = NULL;
        GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
-       if (cliptext)
+       if (cliptext) {
                g_free(cliptext);
+               cliptext = NULL;
+       }
+
        if (gtk_clipboard_wait_is_text_available(clip))
                cliptext = gtk_clipboard_wait_for_text(clip);
 }