| Message ID | xmqq35f7kzad.fsf@gitster.g (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0ad13977a7f6226d753ec12aedaaa9db7e57dad |
| Headers | show |
| Series | revision: mark blobs needed for resolve-undo as reachable | expand |
diff --git a/builtin/fsck.c b/builtin/fsck.c index 4b17ccc3f4..6c73092f10 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -784,6 +784,7 @@ static int fsck_resolve_undo(struct index_state *istate) error(_("%s: invalid sha1 pointer in resolve-undo"), oid_to_hex(&ru->oid[i])); errors_found |= ERROR_REFS; + continue; } obj->flags |= USED; fsck_put_object_name(&fsck_walk_options, &ru->oid[i],
When we found an invalid object recorded in the resolve-undo data, we would have ended up dereferencing NULL while fsck. Reporting the problem and going on to the next object is the right thing to do here. Noticed by SZEDER Gábor <szeder.dev@gmail.com>. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/fsck.c | 1 + 1 file changed, 1 insertion(+)