Merge pull request #3161 from rhc54/topic/cov2

Ralph Castain · web-flow · commit 955fa0456d6b · 2017-03-14T10:10:11.000-07:00
Silence Coverity warnings
diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c
@@ -1106,7 +1106,8 @@ static void launch_daemons(int fd, short args, void *cbdata)
                        true, mca_plm_rsh_component.num_concurrent, map->num_new_daemons);
         ORTE_ERROR_LOG(ORTE_ERR_FATAL);
         OBJ_RELEASE(state);
-        return;
+        rc = ORTE_ERR_SILENT;
+        goto cleanup;
     }
 
     /*
@@ -1151,6 +1152,13 @@ static void launch_daemons(int fd, short args, void *cbdata)
             }
         }
     }
+    if (NULL == node) {
+        /* this should be impossible, but adding the check will
+         * silence code checkers that don't know better */
+        ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
+        rc = ORTE_ERR_NOT_FOUND;
+        goto cleanup;
+    }
 
     /* if we are tree launching, find our children and create the launch cmd */
     if (!mca_plm_rsh_component.no_tree_spawn) {

Original file line number	Diff line number	Diff line change
`@@ -1106,7 +1106,8 @@ static void launch_daemons(int fd, short args, void *cbdata)`
`1106`	`1106`	`true, mca_plm_rsh_component.num_concurrent, map->num_new_daemons);`
`1107`	`1107`	`ORTE_ERROR_LOG(ORTE_ERR_FATAL);`
`1108`	`1108`	`OBJ_RELEASE(state);`
`1109`		`- return;`
	`1109`	`+ rc = ORTE_ERR_SILENT;`
	`1110`	`+ goto cleanup;`
`1110`	`1111`	`}`
`1111`	`1112`
`1112`	`1113`	`/*`
`@@ -1151,6 +1152,13 @@ static void launch_daemons(int fd, short args, void *cbdata)`
`1151`	`1152`	`}`
`1152`	`1153`	`}`
`1153`	`1154`	`}`
	`1155`	`+ if (NULL == node) {`
	`1156`	`+ /* this should be impossible, but adding the check will`
	`1157`	`+ * silence code checkers that don't know better */`
	`1158`	`+ ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);`
	`1159`	`+ rc = ORTE_ERR_NOT_FOUND;`
	`1160`	`+ goto cleanup;`
	`1161`	`+ }`
`1154`	`1162`
`1155`	`1163`	`/* if we are tree launching, find our children and create the launch cmd */`
`1156`	`1164`	`if (!mca_plm_rsh_component.no_tree_spawn) {`