Merge pull request #10467 from joshfisher-cornelisnetworks/josh_main

opal: Segfault avoidence in mca/btl/ofi

Author: hppritcha

opal/mca/btl/ofi/btl_ofi_component.c

@@ -625,8 +625,10 @@ static int mca_btl_ofi_init_device(struct fi_info *info)
 
     /* if the contexts have not been initiated, num_contexts should
      * be zero and we skip this. */
-    for (int i = 0; i < module->num_contexts; i++) {
-        mca_btl_ofi_context_finalize(&module->contexts[i], module->is_scalable_ep);
+    if (NULL != module->contexts) {
+        for (int i = 0; i < module->num_contexts; i++) {
+            mca_btl_ofi_context_finalize(&module->contexts[i], module->is_scalable_ep);
+        }
     }
     free(module->contexts);
 

opal/mca/btl/ofi/btl_ofi_context.c

@@ -264,7 +264,9 @@ void mca_btl_ofi_context_finalize(mca_btl_ofi_context_t *context, bool scalable_
     }
 
     /* Can we destruct the object that hasn't been constructed? */
-    OBJ_DESTRUCT(&context->rdma_comp_list);
+    if (context->rdma_comp_list.fl_num_allocated != 0){
+        OBJ_DESTRUCT(&context->rdma_comp_list);
+    }
 
     if (TWO_SIDED_ENABLED) {
         OBJ_DESTRUCT(&context->frag_comp_list);