File U_19-Return-early-if-size_valp-is-zero.patch of Package slurm

Overview Repositories Revisions Requests Users Attributes Meta

File U_19-Return-early-if-size_valp-is-zero.patch of Package slurm

From: Tim Wickberg <tim@schedmd.com>
Date: Wed Nov 29 15:37:54 2023 -0700
Subject: [PATCH 19/28]Return early if *size_valp is zero.
Patch-mainline: Upstream
Git-repo: https://github.com/SchedMD/slurm
Git-commit: 1555efad7b3498482cdb8c90a09d5ca9951485ae
References: bsc#1218046, bsc#1218050, bsc#1218051, bsc#1218053
Signed-off-by: Egbert Eich <eich@suse.de>

Signed-off-by: Egbert Eich <eich@suse.com>
---
 src/common/pack.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/common/pack.c b/src/common/pack.c
index 3e27f9dc79..f865779986 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -854,6 +854,9 @@ int unpackmem_ptr(char **valp, uint32_t * size_valp, Buf buffer)
 	*valp = NULL;
 	safe_unpack32(size_valp, buffer);
 
+	if (!*size_valp)
+		return SLURM_SUCCESS;
+
 	if (*size_valp > MAX_ARRAY_LEN_LARGE) {
 		error("%s: Buffer to be unpacked is too large (%u > %u)",
 		      __func__, *size_valp, MAX_ARRAY_LEN_LARGE);
@@ -920,6 +923,9 @@ int unpackmem_xmalloc(char **valp, uint32_t * size_valp, Buf buffer)
 	*valp = NULL;
 	safe_unpack32(size_valp, buffer);
 
+	if (!*size_valp)
+		return SLURM_SUCCESS;
+
 	if (*size_valp > MAX_ARRAY_LEN_LARGE) {
 		error("%s: Buffer to be unpacked is too large (%u > %u)",
 		      __func__, *size_valp, MAX_ARRAY_LEN_LARGE);
@@ -953,6 +959,9 @@ int unpackmem_malloc(char **valp, uint32_t * size_valp, Buf buffer)
 	*valp = NULL;
 	safe_unpack32(size_valp, buffer);
 
+	if (!*size_valp)
+		return SLURM_SUCCESS;
+
 	if (*size_valp > MAX_PACK_MEM_LEN) {
 		error("%s: Buffer to be unpacked is too large (%u > %u)",
 		      __func__, *size_valp, MAX_ARRAY_LEN_SMALL);
@@ -995,6 +1004,9 @@ int unpackstr_xmalloc_escaped(char **valp, uint32_t *size_valp, Buf buffer)
 	*valp = NULL;
 	safe_unpack32(size_valp, buffer);
 
+	if (!*size_valp)
+		return SLURM_SUCCESS;
+
 	if (*size_valp > MAX_PACK_MEM_LEN) {
 		error("%s: Buffer to be unpacked is too large (%u > %u)",
 		      __func__, *size_valp, MAX_PACK_MEM_LEN);

Places

File U_19-Return-early-if-size_valp-is-zero.patch of Package slurm

Places