Merge pull request #11744 from wenduwan/fix_double_free

opal/mca/ofi: Patch series to fix a crash due to double free on error path

Author: lrbison

opal/mca/common/ofi/common_ofi.c

@@ -702,13 +702,14 @@ static int count_providers(struct fi_info *provider_list)
     return num_provider;
 }
 
-/* Calculate the current process package rank.
- *     @param (IN) process_info     struct opal_process_info_t information
- *                                  about the current process. used to get
- *                                  num_local_peers, myprocid.rank, and
- *                                  my_local_rank.
+/**
+ * @brief the current process package rank.
+ *
+ * @param[in]   process_info    struct opal_process_info_t information
+ *                              about the current process. used to get
+ *                              num_local_peers, myprocid.rank.
  *
- *     @param (OUT)                 uint32_t package rank or myprocid.rank
+ * @return package rank or myprocid.rank
  *
  * If successful, returns PMIX_PACKAGE_RANK, or an
  * equivalent calculated package rank.
@@ -768,8 +769,9 @@ static uint32_t get_package_rank(opal_process_info_t *process_info)
         relative_locality = opal_hwloc_compute_relative_locality(process_info->locality,
                                                                  locality_string);
         free(locality_string);
+        locality_string = NULL;
 
-        if ((uint16_t) pname.vpid == process_info->my_local_rank) {
+        if ((uint16_t) pname.vpid == process_info->myprocid.rank) {
             return ranks_on_package;
         }