From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 16 Feb 2022 10:15:09 +0000 (+0000)
Subject: xdiff: handle allocation failure when merging
X-Git-Tag: v2.36.0-rc0~85^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43ad3af380702d9e304140f259480de59320e587;p=thirdparty%2Fgit.git

xdiff: handle allocation failure when merging

Other users of xdiff such as libgit2 need to be able to handle
allocation failures. These allocation failures were previously
ignored.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index d43abe05b9..af40c88a5b 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -708,13 +708,18 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 	    xdl_build_script(&xe2, &xscr2) < 0)
 		goto out;
 
-	status = 0;
 	if (!xscr1) {
 		result->ptr = xdl_malloc(mf2->size);
+		if (!result->ptr)
+			goto out;
+		status = 0;
 		memcpy(result->ptr, mf2->ptr, mf2->size);
 		result->size = mf2->size;
 	} else if (!xscr2) {
 		result->ptr = xdl_malloc(mf1->size);
+		if (!result->ptr)
+			goto out;
+		status = 0;
 		memcpy(result->ptr, mf1->ptr, mf1->size);
 		result->size = mf1->size;
 	} else {