X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sha1_file.c;h=956422ba4a5df5f46caaf85f10e4c85321439272;hb=fc2d99f1e95252dcd3eb645a370a658bea7fd5bd;hp=27f3b9b278a97f66f92ca61a2bc39e30f0a70317;hpb=82bc9f515c93cdb66f87092c7e270b8de112919f;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index 27f3b9b27..956422ba4 100644
--- 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;
@@ -2616,7 +2617,7 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,
 	if ((type == OBJ_BLOB) && path) {
 		struct strbuf nbuf = STRBUF_INIT;
 		if (convert_to_git(path, buf, size, &nbuf,
-		                   write_object ? safe_crlf : 0)) {
+				   write_object ? safe_crlf : SAFE_CRLF_FALSE)) {
 			buf = strbuf_detach(&nbuf, &size);
 			re_allocated = 1;
 		}