diff options
| author | Jeff King <peff@peff.net> | 2017-02-08 15:52:45 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-08 15:39:55 -0800 |
| commit | 3a1345af289703a04ff4754f9167ed3cfa2dfdce (patch) | |
| tree | d23b071a8bad85195f3e75790ba407997741faa5 | |
| parent | 6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff) | |
| download | git-3a1345af289703a04ff4754f9167ed3cfa2dfdce.tar.gz | |
for_each_alternate_ref: handle failure from real_pathdup()
In older versions of git, if real_path() failed to resolve
the alternate object store path, we would die() with an
error. However, since 4ac9006f8 (real_path: have callers use
real_pathdup and strbuf_realpath, 2016-12-12) we use the
real_pathdup() function, which may return NULL. Since we
don't check the return value, we can segfault.
This is hard to trigger in practice, since we check that the
path is accessible before creating the alternate_object_database
struct. But it could be removed racily, or we could see a
transient filesystem error.
We could restore the original behavior by switching back to
xstrdup(real_path()). However, dying is probably not the
best option here. This whole function is best-effort
already; there might not even be a repository around the
shared objects at all. And if the alternate store has gone
away, there are no objects to show.
So let's just quietly return, as we would if we failed to
open "refs/", or if upload-pack failed to start, etc.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | transport.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/transport.c b/transport.c index d72e089484..9ce0ee96ba 100644 --- a/transport.c +++ b/transport.c @@ -1222,6 +1222,8 @@ static int refs_from_alternate_cb(struct alternate_object_database *e, struct alternate_refs_data *cb = data; other = real_pathdup(e->path); + if (!other) + return 0; len = strlen(other); while (other[len-1] == '/') |