@matheusbsbs / matheus-bagliano / commits / 1b0eeec3f3

gpg-interface: handle bool user.signingkey

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>

Jeff King committed Apr 13, 2018 at 15:18 UTC 1b0eeec3f359888f8a638de8af253f621a5b836e

1 file changed +6

gpg-interface.c

@@ -128,13 +128,19 @@ void set_signing_key(const char *key)

128 int git_gpg_config(const char *var, const char *value, void *cb)

129 {

130 if (!strcmp(var, "user.signingkey")) {

131 + if (!value)

132 + return config_error_nonbool(var);

133 set_signing_key(value);

134 + return 0;

135 }

136 +

137 if (!strcmp(var, "gpg.program")) {

138 if (!value)

139 return config_error_nonbool(var);

140 gpg_program = xstrdup(value);

141 + return 0;

142 }

143 +

144 return 0;

145 }

146