diff options
| author | Jeff King <peff@peff.net> | 2018-11-22 12:31:09 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-11 18:35:53 -0800 |
| commit | 54e8c1121574fca675438ac0bbd7f6a375b92520 (patch) | |
| tree | d238f873bb98bce797b2950105d9cae82a39ed2b /remote.c | |
| parent | 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff) | |
| download | git-54e8c1121574fca675438ac0bbd7f6a375b92520.tar.gz | |
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>
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -335,14 +335,14 @@ static int handle_config(const char *key, const char *value, void *cb) if (!name) return 0; if (!strcmp(subkey, "insteadof")) { - rewrite = make_rewrite(&rewrites, name, namelen); if (!value) return config_error_nonbool(key); + rewrite = make_rewrite(&rewrites, name, namelen); add_instead_of(rewrite, xstrdup(value)); } else if (!strcmp(subkey, "pushinsteadof")) { - rewrite = make_rewrite(&rewrites_push, name, namelen); if (!value) return config_error_nonbool(key); + rewrite = make_rewrite(&rewrites_push, name, namelen); add_instead_of(rewrite, xstrdup(value)); } } |