From 5cc672d1d7ab72861f77f2b7e2e22449418cf5d2 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 27 Aug 2013 14:39:28 -0700
Subject: [PATCH] Prevent possible NULL memory reference
---
src/scontrol/scontrol.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index ff49efa15ea..147e0a4c57c 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -1702,11 +1702,14 @@ _update_bluegene_subbp (int argc, char *argv[])
*/
static int _update_slurmctld_debug(char *val)
{
- char *endptr;
+ char *endptr = NULL;
int error_code = SLURM_SUCCESS;
- uint32_t level = (uint32_t)strtoul(val, &endptr, 10);
+ uint32_t level;
- if (*endptr != '\0' || level > 9) {
+ if (val)
+ level = (uint32_t)strtoul(val, &endptr, 10);
+
+ if ((val == NULL) || (*endptr != '\0') || (level > 9)) {
error_code = 1;
if (quiet_flag != 1)
fprintf(stderr, "invalid debug level: %s\n",
--
GitLab