aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-11-01 21:49:59 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-11-01 21:49:59 +0000
commit7f62028d668eaddd1aeaed42c8a0e3ce4947b51f (patch)
tree6b3ffb5f3d4b2e24d7ad18fcf39b440baa56f37c
parentd34fe06fb0154d8005f54ab1d164acd6595a2f00 (diff)
Toby Peterson patched a memory problem in the command line tool that
happened when a user had a home dir as an empty string. curl would then do free() on a wrong area.
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES3
-rw-r--r--src/homedir.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c866fd8f1..bdca20044 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Daniel S (1 Nov 2007)
+- Toby Peterson patched a memory problem in the command line tool that
+ happened when a user had a home dir as an empty string. curl would then do
+ free() on a wrong area.
+
Dan F (1 Nov 2007)
- Fixed curl-config --features to not display libz when it wasn't used
due to a missing header file.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82cc069ed..d2d64d98f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following bugfixes:
o curl-config --features and --protocols show the correct output when built
with NSS, and also when SCP, SFTP and libz are not available
+ o free problem in the curl tool for users with empty home dir
This release includes the following known bugs:
@@ -32,6 +33,6 @@ New curl mirrors:
This release would not have looked like this without help, code, reports and
advice from friends like these:
-
+ Dan Fandrich, Gisle Vanem, Toby Peterson
Thanks! (and sorry if I forgot to mention someone)
diff --git a/src/homedir.c b/src/homedir.c
index f27aa6924..d9bc39fe5 100644
--- a/src/homedir.c
+++ b/src/homedir.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -106,6 +106,8 @@ char *homedir(void)
#endif
if (home && home[0])
home = strdup(home);
+ else
+ home = NULL;
}
}
#endif /* PWD-stuff */