Merge branch 'ph/rerere-doc' into maint-1.7.8

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 6dcae3882bf969cce9ae0a973a80abf76e3bb814..956422ba4a5df5f46caaf85f10e4c85321439272 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1267,7 +1267,8 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
        while (c & 0x80) {
                if (len <= used || bitsizeof(long) <= shift) {
                        error("bad object header");
-                       return 0;
+                       size = used = 0;
+                       break;
                }
                c = buf[used++];
                size += (c & 0x7f) << shift;