builtin/apply: free patch when parse_chunk() fails
When parse_chunk() fails it can return -1, for example when find_header() doesn't find a patch header. In this case it's better in apply_patch() to free the "struct patch" that we just allocated instead of leaking it. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Mar 16, 2016 at 20:35 UTC
7a6a44c2dc7a59ef8e117c2f1ea3c06ce6a6ff1f
1 file changed
+3
-1
builtin/apply.c
+3
-1
@@ -4371,8 +4371,10 @@ static int apply_patch(int fd, const char *filename, int options)
4371
patch->inaccurate_eof = !!(options & INACCURATE_EOF);
4372
patch->recount = !!(options & RECOUNT);
4373
nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
4374
- if (nr < 0)
4374
+ if (nr < 0) {
4375
+ free_patch(patch);
4376
break;
4377
+ }
4378
if (apply_in_reverse)
4379
reverse_patches(patch);
4380
if (use_patch(patch)) {