summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-03-16 20:35:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-01 10:21:55 -0700
commit7a6a44c2dc7a59ef8e117c2f1ea3c06ce6a6ff1f (patch)
treeb90e5bee15576156d8a7ca926255bbdb78790ba7 /mergetools/p4merge
parentbuiltin/apply: handle parse_binary() failure (diff)
downloadtgif-7a6a44c2dc7a59ef8e117c2f1ea3c06ce6a6ff1f.tar.xz
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>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions