From: Colin Leroy <colin@colino.net>
Date: Tue, 13 Jul 2004 20:18:36 +0000 (+0000)
Subject: be paranoid on the checks
X-Git-Tag: gtk2_win32_last_merge~352
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=82d1d3c5af87a77aae344f025bf6380392f5aaa3

be paranoid on the checks
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5bf1be56b..01146444e 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-13 [colin]	0.9.12cvs18.8
+
+	* src/pop.c
+		Be paranoid on the checks
+
 2004-07-13 [colin]	0.9.12cvs18.7
 
 	* src/gtk/quicksearch.c
diff --git a/PATCHSETS b/PATCHSETS
index fbe86c9dd..b134a8dc3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -21,3 +21,4 @@
 ( cvs diff -u -r 1.75.2.2 -r 1.75.2.3 src/matcher.c; cvs diff -u -r 1.39.2.3 -r 1.39.2.4 src/matcher.h; cvs diff -u -r 1.25.2.3 -r 1.25.2.4 src/matcher_parser_parse.y; cvs diff -u -r 1.43.2.5 -r 1.43.2.6 src/prefs_matcher.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/quicksearch.c; ) > 0.9.12cvs18.5.patchset
 ( cvs diff -u -r 1.150.2.5 -r 1.150.2.6 src/procmsg.c; cvs diff -u -r 1.395.2.16 -r 1.395.2.17 src/summaryview.c; ) > 0.9.12cvs18.6.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/quicksearch.c; ) > 0.9.12cvs18.7.patchset
+( cvs diff -u -r 1.56.2.14 -r 1.56.2.15 src/pop.c; ) > 0.9.12cvs18.8.patchset
diff --git a/configure.ac b/configure.ac
index dcd9666a0..1e28f253a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=18
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.7
+EXTRA_GTK2_VERSION=.8
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/pop.c b/src/pop.c
index 7b9385fa7..c79f13653 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -747,6 +747,11 @@ static int pop3_uidl_mark_mail(MsgInfo *msginfo, int download)
 	}
 	tinfo = procheader_parse_file(filename, msginfo->flags, TRUE, TRUE);
 
+	if (!tinfo->account_server
+	||  !tinfo->account_login
+	||  !tinfo->partial_recv) {
+		goto bail;
+	}
 	path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
 			   "uidl", G_DIR_SEPARATOR_S, tinfo->account_server,
 			   "-", tinfo->account_login, NULL);