aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@helixcode.com>2000-08-22 03:56:14 +0800
committerJP Rosevear <jpr@src.gnome.org>2000-08-22 03:56:14 +0800
commitb1161811db7b81206fe5991472130ae8237e321d (patch)
tree9a0e363f36552990b1ac64d5e1e84e14d8bc28ee
parentc415597aa45aa1954e32771b6841ced41c55c2cb (diff)
downloadgsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar.gz
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar.bz2
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar.lz
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar.xz
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.tar.zst
gsoc2013-evolution-b1161811db7b81206fe5991472130ae8237e321d.zip
Make sure respbuffer is not null before manipulating it. If it is null,
2000-08-21 JP Rosevear <jpr@helixcode.com> * providers/nntp/camel-nntp-store.c (camel_nntp_command): Make sure respbuffer is not null before manipulating it. If it is null, return CAMEL_NNTP_FAIL and a decent error message. svn path=/trunk/; revision=4906
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/providers/nntp/camel-nntp-store.c13
2 files changed, 17 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 09bfcac267..d072116729 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-21 JP Rosevear <jpr@helixcode.com>
+
+ * providers/nntp/camel-nntp-store.c (camel_nntp_command):
+ Make sure respbuffer is not null before manipulating it.
+ If it is null, return CAMEL_NNTP_FAIL and a decent error
+ message.
+
2000-08-18 Peter Williams <peterw@helixcode.com>
* camel-internet-address.c (internet_encode): If the name is "" we
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 45b1fdee04..74952015a4 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -292,22 +292,29 @@ camel_nntp_command (CamelNNTPStore *store, char **ret, char *fmt, ...)
/* Read the response */
respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream));
- resp_code = atoi (respbuf);
+ if (!respbuf) {
+ if (ret)
+ *ret = g_strdup (g_strerror (errno));
+ return CAMEL_NNTP_FAIL;
+ }
+
+ resp_code = atoi (respbuf);
+
if (resp_code < 400)
status = CAMEL_NNTP_OK;
else if (resp_code < 500)
status = CAMEL_NNTP_ERR;
else
status = CAMEL_NNTP_FAIL;
-
+
if (ret) {
*ret = strchr (respbuf, ' ');
if (*ret)
*ret = g_strdup (*ret + 1);
}
g_free (respbuf);
-
+
return status;
}