Fix handle leak in sha1_file/unpack_objects if there were damaged object data

raalkml · gitster · commit f755bb996ba0 · 2008-11-23T19:31:05.000-08:00
In the case of bad packed object CRC, unuse_pack wasn't called after
check_pack_crc which calls use_pack.

Signed-off-by: Alex Riesen &lt;raa.lkml@gmail.com&gt;
Acked-by: Nicolas Pitre &lt;nico@cam.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/sha1_file.c b/sha1_file.c
@@ -1749,6 +1749,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 			error("bad packed object CRC for %s",
 			      sha1_to_hex(sha1));
 			mark_bad_packed_object(p, sha1);
+			unuse_pack(&w_curs);
 			return NULL;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1749,6 +1749,7 @@ void unpack_entry(struct packed_git p, off_t obj_offset,`
`1749`	`1749`	`error("bad packed object CRC for %s",`
`1750`	`1750`	`sha1_to_hex(sha1));`
`1751`	`1751`	`mark_bad_packed_object(p, sha1);`
	`1752`	`+ unuse_pack(&w_curs);`
`1752`	`1753`	`return NULL;`
`1753`	`1754`	`}`
`1754`	`1755`	`}`