Merge pull request #8483 from awlauria/protect_mbv_enum

Fix case where var->mbv_enumerator can be released when static.

Author: gpaulsen

opal/mca/base/mca_base_var.c

@@ -85,6 +85,12 @@ static int mca_base_var_count = 0;
 
 static opal_hash_table_t mca_base_var_index_hash;
 
+#define OPAL_MCA_VAR_MBV_ENUMERATOR_FREE(mbv_enumerator) {       \
+    if(mbv_enumerator && !mbv_enumerator->enum_is_static) { \
+        OBJ_RELEASE(mbv_enumerator);                        \
+    }                                                       \
+}
+
 const char *ompi_var_type_names[] = {
     "int",
     "unsigned_int",
@@ -872,8 +878,8 @@ int mca_base_var_deregister(int vari)
         var->mbv_storage->stringval) {
         free (var->mbv_storage->stringval);
         var->mbv_storage->stringval = NULL;
-    } else if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
-        OBJ_RELEASE(var->mbv_enumerator);
+    } else {
+        OPAL_MCA_VAR_MBV_ENUMERATOR_FREE(var -> mbv_enumerator);
     }
 
     var->mbv_enumerator = NULL;
@@ -1519,10 +1525,7 @@ static int register_variable (const char *project_name, const char *framework_na
     if (MCA_BASE_VAR_TYPE_BOOL == var->mbv_type) {
         enumerator = &mca_base_var_enum_bool;
     } else if (NULL != enumerator) {
-        if (var->mbv_enumerator) {
-            OBJ_RELEASE (var->mbv_enumerator);
-        }
-
+        OPAL_MCA_VAR_MBV_ENUMERATOR_FREE(var->mbv_enumerator);
         if (!enumerator->enum_is_static) {
             OBJ_RETAIN(enumerator);
         }
@@ -1908,9 +1911,7 @@ static void var_destructor(mca_base_var_t *var)
     }
 
     /* don't release the boolean enumerator */
-    if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
-        OBJ_RELEASE(var->mbv_enumerator);
-    }
+    OPAL_MCA_VAR_MBV_ENUMERATOR_FREE(var->mbv_enumerator);
 
     if (NULL != var->mbv_long_name) {
         free(var->mbv_long_name);