Merge pull request #11164 from drwootton/han_scatter_leak

Fix memory leak in mca_coll_han_scatter_intra_simple: Coverity CID 1490148

Author: bosilca

ompi/mca/coll/han/coll_han_scatter.c

@@ -380,10 +380,6 @@ mca_coll_han_scatter_intra_simple(const void *sbuf, int scount,
                     root_up_rank,
                     up_comm,
                     up_comm->c_coll->coll_scatter_module);
-        if(reorder_buf != sbuf){
-            free(reorder_buf);
-            reorder_buf = NULL;
-        }
     }
 
     /* 2. low scatter on nodes leaders */
@@ -401,6 +397,9 @@ mca_coll_han_scatter_intra_simple(const void *sbuf, int scount,
         free(tmp_buf);
         tmp_buf = NULL;
     }
+    if (reorder_buf != sbuf) {
+        free(reorder_buf);
+    }
 
     return OMPI_SUCCESS;