2005-08-23 [paul] 1.9.13cvs55

	* src/compose.c
		fix paste/wrap crash
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index fc23f02b990a1fcdb6a8662b606b346a56f4a813..755bf30834b597678c28f4f1295bc0fbd92a2b98 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-23 [paul]      1.9.13cvs55
+
+       * src/compose.c
+               fix paste/wrap crash
+               Patch by Colin
+
 2005-08-23 [paul]      1.9.13cvs54
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 1e632789b53c27eb1944dcf2509bc401aff4517f..a543ffcc8179e4132cfa833b2f18cd57713b52a4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -740,3 +740,4 @@
 ( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/addressbook.c;  ) > 1.9.13cvs52.patchset
 ( cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/addressbook.c;  cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/editaddress.c;  ) > 1.9.13cvs53.patchset
 ( cvs diff -u -r 1.115.2.50 -r 1.115.2.51 src/main.c;  ) > 1.9.13cvs54.patchset
+( cvs diff -u -r 1.382.2.154 -r 1.382.2.155 src/compose.c;  ) > 1.9.13cvs55.patchset

diff --git a/configure.ac b/configure.ac
index f1786090807b201bf0cd4b6ef694d7045261b304..e6de3dfa64f70e256689338b34c34c8a337505de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index b784869dc9d51248c764ddd5c6f9a691e0ec56ae..7cd932b072f90648afe925a6f02540ff736f71b1 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3048,7 +3048,7 @@ static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter, gboo
                const gint PARSE_ELEMS = sizeof parser / sizeof parser[0];
                gint last_index = PARSE_ELEMS;
                gint  n;
-               gchar *o_walk, *walk, *bp, *ep;
+               gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
                gint walk_pos;
                
                if (gtk_text_iter_has_tag(&iter, no_wrap_tag) && !force)
@@ -3154,8 +3154,10 @@ colorize:
                        uri_stop  = walk_pos + (ep - o_walk);
                }
                g_free(o_walk);
+               o_walk = NULL;
                gtk_text_iter_forward_line(&iter);
                g_free(quote_str);
+               quote_str = NULL;
                if (startq_offset != -1) {
                        GtkTextIter startquote, endquote;
                        gtk_text_buffer_get_iter_at_offset(