2006-05-16 [colin] 2.2.0cvs22

	* src/mainwindow.c
		Fix bug #922 (sylpheed-claws crashed after
		pushing on Inbox folder)

diff --git a/ChangeLog b/ChangeLog
index a2e108054ea34d2d562b66bd5173424cd652d426..057d005f6171ee84515b972e62fa37d6439036f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-16 [colin]     2.2.0cvs22
+
+       * src/mainwindow.c
+               Fix bug #922 (sylpheed-claws crashed after 
+               pushing on Inbox folder)
+
 2006-05-16 [colin]     2.2.0cvs21
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 7d06292b05faca7bae1d0bd5d6f5e0d8bb380561..b8bd094349d9897c22af5e04dafb57f89bd6e1c1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1491,3 +1491,4 @@
 ( cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/action.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gedit-print.c;  cvs diff -u -r 1.149.2.47 -r 1.149.2.48 src/inc.c;  cvs diff -u -r 1.274.2.110 -r 1.274.2.111 src/mainwindow.c;  cvs diff -u -r 1.79.2.25 -r 1.79.2.26 src/mh.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/statusbar.c;  cvs diff -u -r 1.17.2.27 -r 1.17.2.28 src/send_message.c;  cvs diff -u -r 1.395.2.198 -r 1.395.2.199 src/summaryview.c;  ) > 2.2.0cvs19.patchset
 ( cvs diff -u -r 1.8.2.18 -r 1.8.2.19 src/export.c;  cvs diff -u -r 1.75.2.22 -r 1.75.2.23 src/matcher.c;  cvs diff -u -r 1.395.2.199 -r 1.395.2.200 src/summaryview.c;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/etpan/imap-thread.c;  ) > 2.2.0cvs20.patchset
 ( cvs diff -u -r 1.382.2.271 -r 1.382.2.272 src/compose.c;  ) > 2.2.0cvs21.patchset
+( cvs diff -u -r 1.274.2.111 -r 1.274.2.112 src/mainwindow.c;  ) > 2.2.0cvs22.patchset

diff --git a/configure.ac b/configure.ac
index 617076e01f5c1809c84a5af80ae2ff4fe62d3233..cecbbf31fbd4bdc6eaca1bd0c3ac72ce517ca2cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 0bba138ffbb97351a7b454fbb9b393b9abc0c316..d845950d8b44f683b2a3b398a17380fd6669e29f 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2395,9 +2395,15 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded, gint maxlen)
 
        /* Prepare the work for the next url in the list */
        /* after the closing bracket >, ignore space, comments and tabs */
-       for (;*buf == ' ' || *buf == '(' || *buf == '\t'; buf++)
+       for (;*buf && *buf && (buf == ' ' || *buf == '(' || *buf == '\t'); buf++)
                if (*buf == '(')
                        for (;*buf != ')' && *buf != 0x00; buf++);
+                       
+       if (!buf) {
+               *buffer = NULL;
+               return;
+       }
+
        /* now first non space, non comment must be a comma */
        if (*buf != ',')
                for (;*buf != 0x00; buf++);