Merge pull request #2690 from hjelmn/v2.x_cvar_fix

hppritcha · web-flow · commit bf85cf7f8b56 · 2017-01-22T14:50:25.000-07:00
mca/base: account for NULL string_value in verbose set
diff --git a/opal/mca/base/mca_base_var_enum.c b/opal/mca/base/mca_base_var_enum.c
@@ -171,7 +171,9 @@ static int mca_base_var_enum_verbose_sfv (mca_base_var_enum_t *self, const int v
 
     for (int i = 0 ; verbose_values[i].string ; ++i) {
         if (verbose_values[i].value == value) {
-            *string_value = strdup (verbose_values[i].string);
+            if (string_value) {
+                *string_value = strdup (verbose_values[i].string);
+            }
             return OPAL_SUCCESS;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,9 @@ static int mca_base_var_enum_verbose_sfv (mca_base_var_enum_t *self, const int v`
`171`	`171`
`172`	`172`	`for (int i = 0 ; verbose_values[i].string ; ++i) {`
`173`	`173`	`if (verbose_values[i].value == value) {`
`174`		`- *string_value = strdup (verbose_values[i].string);`
	`174`	`+ if (string_value) {`
	`175`	`+ *string_value = strdup (verbose_values[i].string);`
	`176`	`+ }`
`175`	`177`	`return OPAL_SUCCESS;`
`176`	`178`	`}`
`177`	`179`	`}`