Fix infinite loop when quoting long URL.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ffee2487de1d4dc0aeab387b1109e7f2cd3671c..842957c4fb929e93eeb50809f9de59d8743a491b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-10-29 [darko]
+
+       * src/compose.c
+               fix infinite loop when long URL is quoted
+               (closes bug #475122.
+
 2001-10-28 [match]
 
        * src/mutt.[ch] src/importmutt.[ch] src/mgutils.[ch] src/addressbook.c src/Makefile.am

diff --git a/configure.in b/configure.in
index a6b0cbcaf3783a1219a333f0b1009edbe758114d..1390f361f4392b0ef8a9aa4baacff223e8933c0c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws13
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 79b377c0f88e423945f1addce503b45acd3768b2..7d9222157d1ea55c969d28406f0a3c282293808f 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2399,10 +2399,10 @@ static void compose_wrap_line_all(Compose *compose)
                if (cur_len + ch_len > linewrap_len) {
                        gint tlen;
 
-                       if (line_len == 0) {
+                       if (line_len == 0 || line_pos != prev_line_pos) {
                                /* don't wrap URLs */
                                if (is_url_string(text, line_pos, text_len))
-                                       continue;
+                                       goto dontwrapurl;
                                line_len = cur_pos - line_pos;
                                line_pos = cur_pos;
                        }
@@ -2457,6 +2457,7 @@ static void compose_wrap_line_all(Compose *compose)
                        continue;
                }
 
+dontwrapurl:
                if (ch_len > 1) {
                        line_pos = cur_pos + 1;
                        line_len = cur_len + ch_len;