From af9d934f14c3385fefcdc9cf5c744641ff8ee1e7 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 12 Mar 2014 10:17:40 -0700
Subject: [PATCH] CRAY - Fix issue where multi-prog is used but doesn't have
any arguments on any of the commands.
---
src/slurmd/slurmstepd/multi_prog.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/slurmd/slurmstepd/multi_prog.c b/src/slurmd/slurmstepd/multi_prog.c
index bac3f920436..b7ee990fc26 100644
--- a/src/slurmd/slurmstepd/multi_prog.c
+++ b/src/slurmd/slurmstepd/multi_prog.c
@@ -455,7 +455,9 @@ extern void multi_prog_parse(stepd_step_rec_t *job, uint32_t **gtid)
job->mpmd_set->command[j] = xstrdup(tmp_cmd[i]);
job->mpmd_set->start_pe[j] = i;
job->mpmd_set->total_pe[j]++;
- } else if (!strcmp(tmp_cmd[i-1], tmp_cmd[i]) &&
+ } else if (tmp_cmd[i-1] && tmp_cmd[i] &&
+ tmp_args[i-1] && tmp_args[i] &&
+ !strcmp(tmp_cmd[i-1], tmp_cmd[i]) &&
!strcmp(tmp_args[i-1], tmp_args[i]) &&
!strchr(tmp_args[i-1], '%')) {
if ((ranks_node_id[i] == job->nodeid) &&
--
GitLab