2006-09-26 [colin] 2.5.1cvs3

	* src/partial_download.c
		Fix crasher found by Alexsandar Urosevic

diff --git a/ChangeLog b/ChangeLog
index 4b1fd97cf969327ee93667a30bf8520b4f54f4ce..57cd8ba5458f25b3789bcd91434a1cccea585f61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26 [colin]     2.5.1cvs3
+
+       * src/partial_download.c
+               Fix crasher found by Alexsandar Urosevic
+
 2006-09-26 [colin]     2.5.1cvs2
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index f68dd7da91bafe58c4d446d916d238b8d3b8dcdc..65135d712c1aaff50e03ff8cf881379ded85cad2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1911,3 +1911,4 @@
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.41 -r 1.18.2.42 src/plugins/spamassassin/spamassassin.c;  ) > 2.5.0cvs3.patchset
 ( cvs diff -u -r 1.28.2.26 -r 1.28.2.27 src/mbox.c;  ) > 2.5.1cvs1.patchset
 ( cvs diff -u -r 1.395.2.254 -r 1.395.2.255 src/summaryview.c;  ) > 2.5.1cvs2.patchset
+( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.c;  ) > 2.5.1cvs3.patchset

diff --git a/configure.ac b/configure.ac
index 0f3b86b8cd06169940bd792bf48821a390ea6890..7d8627737f1a67f956f76411a701bd3698574e8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/partial_download.c b/src/partial_download.c
index 3fdf8468d0bc76caddb424baf567fe16a0f9d93a..aa9dacdef1f77292657621cc12520fff07a56340 100644 (file)
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -149,15 +149,17 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
        MsgInfo *tinfo;
        gchar *sanitized_uid = NULL;    
 
-       if (!tinfo->extradata)
-               return err;
-
        filename = procmsg_get_message_file_path(msginfo);
        if (!filename) {
                g_warning("can't get message file path.\n");
                return err;
        }
        tinfo = procheader_parse_file(filename, msginfo->flags, TRUE, TRUE);
+       
+       if (!tinfo->extradata) {
+               g_free(filename);
+               return err;
+       }
 
        sanitized_uid = g_strdup(tinfo->extradata->account_login);
        subst_for_filename(sanitized_uid);