aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-05-07 21:02:21 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-05-07 21:02:21 +0000
commite481d679b264fba519f1e12bc7f131057b8501e9 (patch)
tree5b4f8b0e2e095cdf9f2ce6bae0c60a83da874a96
parenteb68aa38e3a79ee76967261aeb8c4364223f87d9 (diff)
- Liam Healy filed the debian bug report #480044
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480044) identifying a segfault when using krb5 ftp, but the krb4 code had the same problem.
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/ftp.c4
3 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index f68c4f804..51b5bbe66 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,11 @@
Changelog
+Daniel Stenberg (7 May 2008)
+- Liam Healy filed the debian bug report #480044
+ (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480044) identifying a
+ segfault when using krb5 ftp, but the krb4 code had the same problem.
+
Yang Tse (7 May 2008)
- Christopher Palow provided the patch (edited by me) that introduces the
use of microsecond resolution keys for internal splay trees.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4ceb3f9eb..f2565fae2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -31,6 +31,7 @@ This release includes the following bugfixes:
o libcurl sometimes sent body twice when using CURLAUTH_ANY
o configure detecting debug-enabled c-ares
o microsecond resolution keys for internal splay trees
+ o krb4 and krb5 ftp segfault
This release includes the following known bugs:
@@ -52,6 +53,6 @@ advice from friends like these:
Michal Marek, Daniel Fandrich, Scott Barrett, Alexey Simak, Daniel Black,
Rafa Muyo, Andre Guibert de Bruet, Brock Noland, Sandor Feldi, Stefan Krause,
David Shaw, Norbert Frese, Bart Whiteley, Jean-Francois Bertrand, Ben Van Hof,
- Yuriy Sosov, Christopher Palow, Yang Tse
+ Yuriy Sosov, Christopher Palow, Yang Tse, Liam Healy
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/ftp.c b/lib/ftp.c
index 649da81d6..ba24376fe 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -622,9 +622,13 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
struct timeval now = Curl_tvnow();
size_t nread;
int cache_skip=0;
+ int value_to_be_ignored=0;
if(ftpcode)
*ftpcode = 0; /* 0 for errors */
+ else
+ /* make the pointer point to something for the rest of this function */
+ ftpcode = &value_to_be_ignored;
*nreadp=0;