2007-07-27 [paul] 2.10.0cvs76

	* src/compose.c
		fix potential crasher
		thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 68ea5eaef094c90e50f6ff96a4b04f8dc56d40d5..96a63a54281b0f24f842d0d53a52f4e69f066762 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-27 [paul]      2.10.0cvs76
+
+       * src/compose.c
+               fix potential crasher
+               thanks to Colin
+
 2007-07-27 [paul]      2.10.0cvs75
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 6400da188db26a56d5328808089e56327cb13977..828b5e7732243b6c115fa1dc7b5177e8035443b6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2729,3 +2729,4 @@
 ( cvs diff -u -r 1.52.2.42 -r 1.52.2.43 src/prefs_folder_item.c;  ) > 2.10.0cvs73.patchset
 ( cvs diff -u -r 1.155.2.72 -r 1.155.2.73 src/Makefile.am;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/filtering.c;  cvs diff -u -r 1.213.2.151 -r 1.213.2.152 src/folder.c;  cvs diff -u -r 1.274.2.202 -r 1.274.2.203 src/mainwindow.c;  cvs diff -u -r 1.75.2.44 -r 1.75.2.45 src/matcher.c;  cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/matcher.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 src/matcher_parser_parse.y;  cvs diff -u -r 1.150.2.100 -r 1.150.2.101 src/procmsg.c;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/procmsg.h;  cvs diff -u -r 1.25.2.44 -r 1.25.2.45 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.316 -r 1.395.2.317 src/summaryview.c;  cvs diff -u -r 1.68.2.39 -r 1.68.2.40 src/summaryview.h;  cvs diff -u -r 1.43.2.79 -r 1.43.2.80 src/toolbar.c;  cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/toolbar.h;  diff -u /dev/null src/pixmaps/watchthread.xpm;  ) > 2.10.0cvs74.patchset
 ( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset
+( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset

diff --git a/configure.ac b/configure.ac
index b2ba0a1ad0ddca8c57a7a6fd74b053219c92b673..e298e47eba166d14c5e6271bbe16362f4681a8d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=75
+EXTRA_VERSION=76
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 9bbddbe161ab579237d2fd2ebb30871cee45fd58..df545b2094437f01b68bbf9ff8b7ac5b38f878ec 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8423,7 +8423,8 @@ gboolean compose_draft (gpointer data, guint action)
        newmsginfo = folder_item_get_msginfo(draft, msgnum);
        if (!newmsginfo && compose->msgid) {
                newmsginfo = folder_item_get_msginfo_by_msgid(draft, compose->msgid);
-               msgnum = newmsginfo->msgnum;
+               if (newmsginfo)
+                       msgnum = newmsginfo->msgnum;
        }
        if (newmsginfo) {
                procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);