2011-09-18 [colin] 3.7.10cvs17

	* src/news.c
		Fix segfault when connection fails

diff --git a/ChangeLog b/ChangeLog
index ebd14177b6a988f7fdaa03773d9a1990566c0373..871c61d235ddd8a59ca84287b2f78122b6f157ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-18 [colin]     3.7.10cvs17
+
+       * src/news.c
+               Fix segfault when connection fails
+

 2011-09-03 [colin]     3.7.10cvs16
 
        * src/common/ssl.c
 2011-09-03 [colin]     3.7.10cvs16
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index 1d7f3473a7e96334a0b99462ee94911c6c6202a3..0aaacef9c82f1ded1b24ac97c0b04a3625e1b651 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4220,3 +4220,4 @@
 ( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/plugins/pgpmime/pgpmime.c;  ) > 3.7.10cvs14.patchset
 ( cvs diff -u -r 1.654.2.4295 -r 1.654.2.4296 configure.ac;  cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/common/ssl.c;  ) > 3.7.10cvs15.patchset
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/ssl.c;  ) > 3.7.10cvs16.patchset
 ( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/plugins/pgpmime/pgpmime.c;  ) > 3.7.10cvs14.patchset
 ( cvs diff -u -r 1.654.2.4295 -r 1.654.2.4296 configure.ac;  cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/common/ssl.c;  ) > 3.7.10cvs15.patchset
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/ssl.c;  ) > 3.7.10cvs16.patchset

+( cvs diff -u -r 1.101.2.67 -r 1.101.2.68 src/news.c;  ) > 3.7.10cvs17.patchset

diff --git a/configure.ac b/configure.ac
index cd2558999fcfb099769bdabe95887f826deeaddd..dc48234c054f11329750dc922d051bbe3c2e2124 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=16
+EXTRA_VERSION=17

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/news.c b/src/news.c
index 032210cfc1c03b27ea8e4d6a0da0a78ef8a73e5a..3f0e0e7104d5305e1ab6d10d897a040e7e3ff278 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -367,7 +367,11 @@ static Session *news_session_new_for_folder(Folder *folder)
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd);
 #endif
 
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd);
 #endif
 

-       r = nntp_threaded_mode_reader(folder);
+       if (session != NULL)
+               r = nntp_threaded_mode_reader(folder);
+       else
+               r = NEWSNNTP_ERROR_CONNECTION_REFUSED;
+

        if (r != NEWSNNTP_NO_ERROR) {
            if (r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME) {
                /*
        if (r != NEWSNNTP_NO_ERROR) {
            if (r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME) {
                /*