From 7605909d13e3354a34d6765868f418dbbd4bb99e Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 28 Jun 2012 11:04:10 -0700
Subject: [PATCH] Better checking to make sure structure elements exist

---
 src/common/slurm_step_layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/slurm_step_layout.c b/src/common/slurm_step_layout.c
index 8d47506c0b7..ef6ab37df99 100644
--- a/src/common/slurm_step_layout.c
+++ b/src/common/slurm_step_layout.c
@@ -388,7 +388,7 @@ extern int slurm_step_layout_destroy(slurm_step_layout_t *step_layout)
 int slurm_step_layout_host_id (slurm_step_layout_t *s, int taskid)
 {
 	int i, j;
-	if (taskid > s->task_cnt - 1)
+	if (!s->tasks || !s->tids || (taskid > s->task_cnt - 1))
 		return SLURM_ERROR;
 	for (i=0; i < s->node_cnt; i++)
 		for (j=0; j<s->tasks[i]; j++)
-- 
GitLab