summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2014-07-12 20:19:34 +0200
committerDan Fandrich <dan@coneharvesters.com>2014-07-12 20:22:09 +0200
commit135c2dc14f7c417c90d78c538149f610606f89c8 (patch)
treed186ca3094f6e36899abe639af791231d348fb05
parent4a67b3e650372bef9412731b1c9fcdca60757756 (diff)
downloadcurl-135c2dc14f7c417c90d78c538149f610606f89c8.tar.gz
curl-135c2dc14f7c417c90d78c538149f610606f89c8.tar.bz2
curl-135c2dc14f7c417c90d78c538149f610606f89c8.zip
netrc: treat failure to find home dir same as missing netrc file
This previously caused a fatal error (with a confusing error code, at that). Reported by: Glen A Johnson Jr.
-rw-r--r--RELEASE-NOTES1
-rw-r--r--lib/netrc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cc50d4164..bb4bcac0d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -57,6 +57,7 @@ This release includes the following bugfixes:
o gnutls: fixed compilation against versions < 2.12.0
o build: Fixed overridden compiler PDB settings in VC7 to VC12
o ntlm_wb: Fixed buffer size not being large enough for NTLMv2 sessions [11]
+ o netrc: don't abort if home dir cannot be found
This release includes the following known bugs:
diff --git a/lib/netrc.c b/lib/netrc.c
index a1b00b2d6..a7a710159 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -88,7 +88,7 @@ int Curl_parsenetrc(const char *host,
}
if(!home)
- return -1;
+ return retcode; /* no home directory found (or possibly out of memory) */
netrcfile = curl_maprintf("%s%s%s", home, DIR_CHAR, NETRC);
if(home_alloc)