remote: check config validity before creating rewrite struct
When parsing url.foo.insteadOf, we call make_rewrite() and only then check to make sure the config value is a string (and return an error if it isn't). This isn't quite a leak, because the struct we allocate is part of a global array, but it does leave a funny half-finished struct. In practice, it doesn't make much difference because we exit soon after due to the config error anyway. But let's flip the order here to avoid leaving a trap for somebody in the future. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Nov 22, 2018 at 12:31 UTC
54e8c1121574fca675438ac0bbd7f6a375b92520
1 file changed
+2
-2
remote.c
+2
-2
@@ -335,14 +335,14 @@ static int handle_config(const char *key, const char *value, void *cb)
335
if (!name)
336
return 0;
337
if (!strcmp(subkey, "insteadof")) {
338
- rewrite = make_rewrite(&rewrites, name, namelen);
338
if (!value)
339
return config_error_nonbool(key);
340
+ rewrite = make_rewrite(&rewrites, name, namelen);
341
add_instead_of(rewrite, xstrdup(value));
342
} else if (!strcmp(subkey, "pushinsteadof")) {
343
- rewrite = make_rewrite(&rewrites_push, name, namelen);
343
if (!value)
344
return config_error_nonbool(key);
345
+ rewrite = make_rewrite(&rewrites_push, name, namelen);
346
add_instead_of(rewrite, xstrdup(value));
347
}
348
}