2012-01-05 [colin] 3.8.0cvs11

	* src/main.c
		Fix crasher infinite loop

diff --git a/ChangeLog b/ChangeLog
index fcc71836aab268aa6ff7bef3f9d2a2bf9cf18279..d0fe2b84c18881081f2454ed3593cf877b9b69d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-05 [colin]     3.8.0cvs11
+
+       * src/main.c
+               Fix crasher infinite loop
+
 2012-01-03 [colin]     3.8.0cvs10
 
        * src/gtk/gtkcmctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 176f9f7fda4cd2f766be2798720a436594d3125c..7861c0e1c511f9085b4390dba59e3650a059f6db 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4327,3 +4327,4 @@
 ( cvs diff -u -r 1.382.2.597 -r 1.382.2.598 src/compose.c;  cvs diff -u -r 1.50.2.64 -r 1.50.2.65 src/compose.h;  cvs diff -u -r 1.115.2.244 -r 1.115.2.245 src/main.c;  cvs diff -u -r 1.83.2.186 -r 1.83.2.187 src/mimeview.c;  ) > 3.8.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs10.patchset
+( cvs diff -u -r 1.115.2.245 -r 1.115.2.246 src/main.c;  ) > 3.8.0cvs11.patchset

diff --git a/configure.ac b/configure.ac
index e01ce3334d82177e6b10c563bfee90d9be209a0b..9624bed8b4ee3455c0862fd91495cccdb6fe902b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index bff1a7a5a06bb0a57aac76d0d10f260ad27d520f..60a5c853fc2f023db2821117d529917bb63b5e0c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2489,6 +2489,7 @@ static void lock_socket_input_cb(gpointer data,
                        ainfo = (AttachInfo *)curr->data;
                        g_free(ainfo->file);
                        g_free(ainfo);
+                       curr = curr->next;
                }
                g_list_free(files);
                g_free(mailto);