undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http.c: guard config parser from value=NULL

Browse Source 
http.sslcert and friends expect a string value

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-02-11 10:57:22 -08:00
parent b51b2bb4c3
commit 111dd25f3c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
http.c
View File

@ -101,16 +101,18 @@ static int http_options(const char *var, const char *value)
if (!strcmp("http.sslcert", var)) { if (!strcmp("http.sslcert", var)) {
if (ssl_cert == NULL) { if (ssl_cert == NULL) {
ssl_cert = xmalloc(strlen(value)+1); if (!value)
strcpy(ssl_cert, value); return config_error_nonbool(var);
ssl_cert = xstrdup(value);
} }
return 0; return 0;
} }
#if LIBCURL_VERSION_NUM >= 0x070902 #if LIBCURL_VERSION_NUM >= 0x070902
if (!strcmp("http.sslkey", var)) { if (!strcmp("http.sslkey", var)) {
if (ssl_key == NULL) { if (ssl_key == NULL) {
ssl_key = xmalloc(strlen(value)+1); if (!value)
strcpy(ssl_key, value); return config_error_nonbool(var);
ssl_key = xstrdup(value);
} }
return 0; return 0;
} }
@ -118,16 +120,18 @@ static int http_options(const char *var, const char *value)
#if LIBCURL_VERSION_NUM >= 0x070908 #if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var)) { if (!strcmp("http.sslcapath", var)) {
if (ssl_capath == NULL) { if (ssl_capath == NULL) {
ssl_capath = xmalloc(strlen(value)+1); if (!value)
strcpy(ssl_capath, value); return config_error_nonbool(var);
ssl_capath = xstrdup(value);
} }
return 0; return 0;
} }
#endif #endif
if (!strcmp("http.sslcainfo", var)) { if (!strcmp("http.sslcainfo", var)) {
if (ssl_cainfo == NULL) { if (ssl_cainfo == NULL) {
ssl_cainfo = xmalloc(strlen(value)+1); if (!value)
strcpy(ssl_cainfo, value); return config_error_nonbool(var);
ssl_cainfo = xstrdup(value);
} }
return 0; return 0;
} }
@ -157,8 +161,9 @@ static int http_options(const char *var, const char *value)
} }
if (!strcmp("http.proxy", var)) { if (!strcmp("http.proxy", var)) {
if (curl_http_proxy == NULL) { if (curl_http_proxy == NULL) {
curl_http_proxy = xmalloc(strlen(value)+1); if (!value)
strcpy(curl_http_proxy, value); return config_error_nonbool(var);
curl_http_proxy = xstrdup(value);
} }
return 0; return 0;
} }