[PATCH v2 4/4] xdiff: handle allocation failure when merging
From: Phillip Wood via GitGitGadget <hidden>
Date: 2022-02-16 10:15:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Phillip Wood <redacted> 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 <redacted> --- xdiff/xmerge.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index d43abe05b95..af40c88a5b3 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 {
--
gitgitgadget