Merge pull request #6204 from chu11/kvs_strtoul_cleanup

kvs: correct transaction-merge option parsing

Author: mergify[bot]

src/modules/kvs/kvs.c

@@ -2852,8 +2852,15 @@ static int process_args (struct kvs_ctx *ctx, int ac, char **av)
     int i;
 
     for (i = 0; i < ac; i++) {
-        if (strstarts (av[i], "transaction-merge="))
-            ctx->transaction_merge = strtoul (av[i]+13, NULL, 10);
+        if (strstarts (av[i], "transaction-merge=")) {
+            char *endptr;
+            errno = 0;
+            ctx->transaction_merge = strtoul (av[i]+18, &endptr, 10);
+            if (errno != 0 || *endptr != '\0') {
+                errno = EINVAL;
+                return -1;
+            }
+        }
         else {
             flux_log (ctx->h, LOG_ERR, "Unknown option `%s'", av[i]);
             errno = EINVAL;

t/t1000-kvs.t

@@ -1291,4 +1291,8 @@ test_expect_success 'module fails to load with unknown option' '
 	test_must_fail flux module load kvs badopt
 '
 
+test_expect_success 'module fails to load with bad input to transaction-merge' '
+        test_must_fail flux module reload kvs transaction-merge=foobar
+'
+
 test_done