From 2d292a69ba81d2555e28949f5d74addcb08ef2ec Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 10 Oct 2007 07:28:13 +0000 Subject: [PATCH] 2007-10-10 [wwp] 3.0.2cvs47 * src/addrindex.c Fix a crash when there's no From: in email, thanks to Colin. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/addrindex.c | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 224684862..21a0d17f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-10 [wwp] 3.0.2cvs47 + + * src/addrindex.c + Fix a crash when there's no From: in email, thanks to Colin. + 2007-10-09 [paul] 3.0.2cvs46 * src/messageview.c diff --git a/PATCHSETS b/PATCHSETS index ac546c18b..b1d59f89e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2959,3 +2959,4 @@ ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrduplicates.c; cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/addressadd.c; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/addressadd.h; cvs diff -u -r 1.60.2.101 -r 1.60.2.102 src/addressbook.c; cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/addressbook.h; cvs diff -u -r 1.28.2.33 -r 1.28.2.34 src/addrindex.c; cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/addrindex.h; cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/addritem.c; cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/addritem.h; cvs diff -u -r 1.382.2.414 -r 1.382.2.415 src/compose.c; cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/editaddress.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/headerview.c; cvs diff -u -r 1.94.2.155 -r 1.94.2.156 src/messageview.c; cvs diff -u -r 1.83.2.118 -r 1.83.2.119 src/mimeview.c; cvs diff -u -r 1.395.2.327 -r 1.395.2.328 src/summaryview.c; cvs diff -u -r 1.96.2.182 -r 1.96.2.183 src/textview.c; cvs diff -u -r 1.5.2.66 -r 1.5.2.67 src/gtk/gtkutils.c; ) > 3.0.2cvs44.patchset ( cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/editaddress.c; cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/headerview.c; cvs diff -u -r 1.96.2.183 -r 1.96.2.184 src/textview.c; ) > 3.0.2cvs45.patchset ( cvs diff -u -r 1.94.2.156 -r 1.94.2.157 src/messageview.c; cvs diff -u -r 1.395.2.328 -r 1.395.2.329 src/summaryview.c; cvs diff -u -r 1.96.2.184 -r 1.96.2.185 src/textview.c; ) > 3.0.2cvs46.patchset +( cvs diff -u -r 1.28.2.34 -r 1.28.2.35 src/addrindex.c; ) > 3.0.2cvs47.patchset diff --git a/configure.ac b/configure.ac index 6806e362f..bbd9a318d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=46 +EXTRA_VERSION=47 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addrindex.c b/src/addrindex.c index 41ca856dd..32542f92f 100644 --- a/src/addrindex.c +++ b/src/addrindex.c @@ -3179,6 +3179,9 @@ gchar *addrindex_get_picture_file(const gchar *emailaddr) gchar *filename = NULL; gchar *raw_addr = NULL; + if (!emailaddr) + return NULL; + Xstrdup_a(raw_addr, emailaddr, return NULL); extract_address(raw_addr); -- 2.25.1