Resolve Coverity problems reported in issue #9705

David Wootton · David Wootton · commit a750a4d62d94 · 2021-12-01T13:02:25.000-05:00
The Coverity CID numbers resolved by this pull request are CID 1494435 CID 1494436 Signed-off-by: David Wootton <dwootton@us.ibm.com> (cherry picked from commit 82a868e)
diff --git a/opal/mca/btl/tcp/btl_tcp_component.c b/opal/mca/btl/tcp/btl_tcp_component.c
@@ -673,7 +673,7 @@ static char **split_and_resolve(char **orig_str, char *name, bool reqd)
                 opal_output_verbose(20,
                                     opal_btl_base_framework.framework_output,
                                     "btl: tcp: Using interface: %s ", argv[i]);
-                opal_argv_append(&interface_count, &interfaces, strdup(argv[i]));
+                opal_argv_append(&interface_count, &interfaces, argv[i]);
             }
             continue;
         }
@@ -735,7 +735,7 @@ static char **split_and_resolve(char **orig_str, char *name, bool reqd)
                                         "btl: tcp: Found match: %s (%s)",
                                         opal_net_get_hostname((struct sockaddr*) &if_inaddr),
                                         if_name);
-                    opal_argv_append(&interface_count, &interfaces, strdup(if_name));
+                    opal_argv_append(&interface_count, &interfaces, if_name);
                 }
             }
         }
@@ -755,7 +755,9 @@ static char **split_and_resolve(char **orig_str, char *name, bool reqd)
     }
 
     /* Mark the end of the interface name array with NULL */
-    interfaces[interface_count] = NULL;
+    if (NULL != interfaces) {
+        interfaces[interface_count] = NULL;
+    }
     free(argv);
     free(*orig_str);
     *orig_str = opal_argv_join(interfaces, ',');

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ static char split_and_resolve(char orig_str, char *name, bool reqd)`
`673`	`673`	`opal_output_verbose(20,`
`674`	`674`	`opal_btl_base_framework.framework_output,`
`675`	`675`	`"btl: tcp: Using interface: %s ", argv[i]);`
`676`		`- opal_argv_append(&interface_count, &interfaces, strdup(argv[i]));`
	`676`	`+ opal_argv_append(&interface_count, &interfaces, argv[i]);`
`677`	`677`	`}`
`678`	`678`	`continue;`
`679`	`679`	`}`
`@@ -735,7 +735,7 @@ static char split_and_resolve(char orig_str, char *name, bool reqd)`
`735`	`735`	`"btl: tcp: Found match: %s (%s)",`
`736`	`736`	`opal_net_get_hostname((struct sockaddr*) &if_inaddr),`
`737`	`737`	`if_name);`
`738`		`- opal_argv_append(&interface_count, &interfaces, strdup(if_name));`
	`738`	`+ opal_argv_append(&interface_count, &interfaces, if_name);`
`739`	`739`	`}`
`740`	`740`	`}`
`741`	`741`	`}`
`@@ -755,7 +755,9 @@ static char split_and_resolve(char orig_str, char *name, bool reqd)`
`755`	`755`	`}`
`756`	`756`
`757`	`757`	`/* Mark the end of the interface name array with NULL */`
`758`		`- interfaces[interface_count] = NULL;`
	`758`	`+ if (NULL != interfaces) {`
	`759`	`+ interfaces[interface_count] = NULL;`
	`760`	`+ }`
`759`	`761`	`free(argv);`
`760`	`762`	`free(*orig_str);`
`761`	`763`	`*orig_str = opal_argv_join(interfaces, ',');`