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

gpg-interface: handle bool user.signingkey

Browse Source 
The config handler for user.signingkey does not check for a
boolean value, and thus:

  git -c user.signingkey tag

will segfault. We could fix this and even shorten the code
by using git_config_string(). But our set_signing_key()
helper is used by other code outside of gpg-interface.c, so
we must keep it (and we may as well use it, because unlike
git_config_string() it does not leak when we overwrite an
old value).

Ironically, the handler for gpg.program just below _could_
use git_config_string() but doesn't. But since we're going
to touch that in a future patch, we'll leave it alone for
now. We will add some whitespace and returns in preparation
for adding more config keys, though.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Ben Toews <mastahyeti@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-04-13 15:18:30 -06:00 committed by Junio C Hamano
parent cf98a52ba4
commit 1b0eeec3f3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpg-interface.c
View File

@ -128,13 +128,19 @@ void set_signing_key(const char *key)
int git_gpg_config(const char *var, const char *value, void *cb) int git_gpg_config(const char *var, const char *value, void *cb)
{ {
if (!strcmp(var, "user.signingkey")) { if (!strcmp(var, "user.signingkey")) {
if (!value)
return config_error_nonbool(var);
set_signing_key(value); set_signing_key(value);
return 0;
} }
if (!strcmp(var, "gpg.program")) { if (!strcmp(var, "gpg.program")) {
if (!value) if (!value)
return config_error_nonbool(var); return config_error_nonbool(var);
gpg_program = xstrdup(value); gpg_program = xstrdup(value);
return 0;
} }
return 0; return 0;
} }