2007-09-18 [colin] 3.0.1cvs5

	* src/common/utils.c
		Fix bug 1321, 'access before allocation
		when scanning for uris'. Patch by
		Guillaume Chazarain <guichaz@yahoo.fr>

diff --git a/ChangeLog b/ChangeLog
index 534837aa502ae18813ed502302a3d4e282500684..7d7111e84656775aa0e359a71ccdb8c26163a6db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-18 [colin]     3.0.1cvs5
+
+       * src/common/utils.c
+               Fix bug 1321, 'access before allocation 
+               when scanning for uris'. Patch by 
+               Guillaume Chazarain <guichaz@yahoo.fr>
+
 2007-09-18 [colin]     3.0.1cvs4
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 2f3832edfd62982932aa78ed9109fe0ddbfd339e..550105e4fb0db6e92c0aa7f9df57be1a6bd0113e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2868,3 +2868,4 @@
 ( cvs diff -u -r 1.155.2.74 -r 1.155.2.75 src/Makefile.am;  cvs diff -u -r 1.274.2.211 -r 1.274.2.212 src/mainwindow.c;  cvs diff -u -r 1.94.2.151 -r 1.94.2.152 src/messageview.c;  cvs diff -u -r 1.19.2.16 -r 1.19.2.17 src/messageview.h;  cvs diff -u -r 1.3.2.16 -r 1.3.2.17 src/prefs_ext_prog.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/prefs_fonts.c;  diff -u /dev/null src/printing.c;  diff -u /dev/null src/printing.h;  cvs diff -u -r 1.395.2.325 -r 1.395.2.326 src/summaryview.c;  ) > 3.0.1cvs2.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/printing.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/printing.h;  ) > 3.0.1cvs3.patchset
 ( cvs diff -u -r 1.43.2.82 -r 1.43.2.83 src/toolbar.c;  ) > 3.0.1cvs4.patchset
+( cvs diff -u -r 1.36.2.111 -r 1.36.2.112 src/common/utils.c;  ) > 3.0.1cvs5.patchset

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

diff --git a/src/common/utils.c b/src/common/utils.c
index 1e52031e635c242827a27a98134cded078d2a7ed..200c7c494ce562fdbcd0dd4534f5fdb2eda84bf8 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -4568,7 +4568,7 @@ search_again:
 
        if (!result) return FALSE;
 
-       if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"'
+       if (*ep_ && bp_ != start && *(bp_ - 1) == '"' && *(ep_) == '"'
        && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
        && IS_RFC822_CHAR(*(ep_ + 3))) {
                /* this informative part with an @ in it is