Christian Couder <christian.couder@xxxxxxxxx> writes:
> 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@xxxxxxxxxxxxx>
> ---
> builtin/apply.c | 4 +++-
OK. Will queue. Thanks.
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 42c610e..bf78282 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -4373,8 +4373,10 @@ static int apply_patch(int fd, const char *filename, int options)
> patch->inaccurate_eof = !!(options & INACCURATE_EOF);
> patch->recount = !!(options & RECOUNT);
> nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
> - if (nr < 0)
> + if (nr < 0) {
> + free_patch(patch);
> break;
> + }
> if (apply_in_reverse)
> reverse_patches(patch);
> if (use_patch(patch)) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html