File U_24-Allow-malloc-to-fail-and-return-an-error-i... of Package slurm.32299

Overview Repositories Revisions Requests Users Attributes Meta

File U_24-Allow-malloc-to-fail-and-return-an-error-instead-of-abort-ing.patch of Package slurm.32299

From: Tim Wickberg <tim@schedmd.com>
Date: Wed Nov 29 15:44:01 2023 -0700
Subject: [PATCH 24/28]Allow malloc() to fail and return an error instead of abort()ing.
Patch-mainline: Upstream
Git-repo: https://github.com/SchedMD/slurm
Git-commit: 621349097c4cd748a06dc957bd1bc88934fea747
References: bsc#1218046, bsc#1218050, bsc#1218051, bsc#1218053
Signed-off-by: Egbert Eich <eich@suse.de>

---
 src/common/pack.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/pack.c b/src/common/pack.c
index b9b2988f5b..6883247130 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -974,11 +974,8 @@ int unpackmem_malloc(char **valp, uint32_t * size_valp, Buf buffer)
 	if (remaining_buf(buffer) < *size_valp)
 		goto unpack_error;
 
-	*valp = malloc(*size_valp);
-	if (*valp == NULL) {
-		log_oom(__FILE__, __LINE__, __func__);
-		abort();
-	}
+	if (!(*valp = malloc(*size_valp)))
+		goto unpack_error;
 	memcpy(*valp, &buffer->head[buffer->processed], *size_valp);
 	buffer->processed += *size_valp;

Places

File U_24-Allow-malloc-to-fail-and-return-an-error-instead-of-abort-ing.patch of Package slurm.32299

Places