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

Fix parsing of imap.preformattedHTML and imap.sslverify

Browse Source 
These two variables are boolean and can lack "= value" in the
configuration file.  Do not reject such input early in the
parser callback function.

Also the key are downcased before being given to the callback,
so we should run strcmp() with keyword spelled in all-lowercase.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-02-06 11:26:35 -08:00
parent c64d84f145
commit ace706e2a6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
imap-send.c
View File

@ -1399,11 +1399,16 @@ static int git_imap_config(const char *key, const char *val, void *cb)
if (strncmp(key, imap_key, sizeof imap_key - 1)) if (strncmp(key, imap_key, sizeof imap_key - 1))
return 0; return 0;
if (!val)
return config_error_nonbool(key);
key += sizeof imap_key - 1; key += sizeof imap_key - 1;
/* check booleans first, and barf on others */
if (!strcmp("sslverify", key))
server.ssl_verify = git_config_bool(key, val);
else if (!strcmp("preformattedhtml", key))
server.use_html = git_config_bool(key, val);
else if (!val)
return config_error_nonbool(key);
if (!strcmp("folder", key)) { if (!strcmp("folder", key)) {
imap_folder = xstrdup(val); imap_folder = xstrdup(val);
} else if (!strcmp("host", key)) { } else if (!strcmp("host", key)) {
@ -1424,10 +1429,6 @@ static int git_imap_config(const char *key, const char *val, void *cb)
server.port = git_config_int(key, val); server.port = git_config_int(key, val);
else if (!strcmp("tunnel", key)) else if (!strcmp("tunnel", key))
server.tunnel = xstrdup(val); server.tunnel = xstrdup(val);
else if (!strcmp("sslverify", key))
server.ssl_verify = git_config_bool(key, val);
else if (!strcmp("preformattedHTML", key))
server.use_html = git_config_bool(key, val);
return 0; return 0;
} }