From ecfd007f28e0fb2257ab058e5df64edae5353fad Mon Sep 17 00:00:00 2001
From: Dominik Bartkiewicz <bart@schedmd.com>
Date: Tue, 9 May 2017 15:30:16 -0600
Subject: [PATCH] Return error when bad separator is given for scontrol update
job licenses.
---
NEWS | 1 +
src/slurmctld/licenses.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index f14b8bde6e7..ba362ffee4b 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,7 @@ documents those changes that are of interest to users and administrators.
destroying a mutex.
-- Fix updating job priority on multiple partitions to be correct.
-- Don't remove admin comment when updating a job.
+ -- Return error when bad separator is given for scontrol update job licenses.
* Changes in Slurm 17.02.2
==========================
diff --git a/src/slurmctld/licenses.c b/src/slurmctld/licenses.c
index 0e65617acf7..2a7053e3f58 100644
--- a/src/slurmctld/licenses.c
+++ b/src/slurmctld/licenses.c
@@ -148,9 +148,12 @@ static List _build_license_list(char *licenses, bool *valid)
if ((token[i] == ':') || (token[i] == '*')) {
token[i++] = '\0';
num = (int32_t)strtol(&token[i], &end_num, 10);
+ if (*end_num != '\0')
+ *valid = false;
+ break;
}
}
- if (num < 0) {
+ if (num < 0 || !(*valid)) {
*valid = false;
break;
}
--
GitLab