Merge pull request #3601 from rhc54/topic/fix

Ralph Castain · web-flow · commit 8e583dcf767e · 2017-05-28T21:36:21.000-07:00
Protect against the condition where the port string is actually NULL
diff --git a/ompi/mca/rte/orte/rte_orte_module.c b/ompi/mca/rte/orte/rte_orte_module.c
@@ -208,7 +208,7 @@ bool ompi_rte_connect_accept_support(const char *port)
     /* were we launched by mpirun, or are we calling
      * without a defined port? */
     if (NULL == orte_process_info.my_hnp_uri ||
-        0 == strlen(port)) {
+        NULL == port || 0 == strlen(port)) {
         return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ bool ompi_rte_connect_accept_support(const char *port)`
`208`	`208`	`/* were we launched by mpirun, or are we calling`
`209`	`209`	`* without a defined port? */`
`210`	`210`	`if (NULL == orte_process_info.my_hnp_uri \|\|`
`211`		`- 0 == strlen(port)) {`
	`211`	`+ NULL == port \|\| 0 == strlen(port)) {`
`212`	`212`	`return true;`
`213`	`213`	`}`
`214`	`214`