[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-27-ge65d15d

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  e65d15dcd45aa30c20b697e7762e79016ff02ec7 (commit)
      from  ff16f6f65cc4b92b37947bc3755f8bf129163f85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/e65d15dcd45aa30c20b697e7762e79016ff02ec7

commit e65d15dcd45aa30c20b697e7762e79016ff02ec7
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date:   Fri Mar 7 16:06:38 2014 -0600

    Fixes failing electric-fence check
    
    electric-fence tool detects malloc(0) in mpid_nem_init.c
    
    Fixes #2054
    
    Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
index 095ab20..6a23ed1 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
@@ -183,7 +183,8 @@ MPID_nem_init(int pg_rank, MPIDI_PG_t *pg_p, int has_parent ATTRIBUTE((unused)))
     MPID_nem_mem_region.local_rank     = local_rank;
     MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.local_ranks, int *, num_procs * sizeof(int), mpi_errno, "mem_region local ranks");
     MPID_nem_mem_region.ext_procs      = num_procs - num_local ;
-    MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.ext_ranks, int *, MPID_nem_mem_region.ext_procs * sizeof(int), mpi_errno, "mem_region ext ranks");
+    if (MPID_nem_mem_region.ext_procs > 0)
+        MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.ext_ranks, int *, MPID_nem_mem_region.ext_procs * sizeof(int), mpi_errno, "mem_region ext ranks");
     MPID_nem_mem_region.next           = NULL;
 
     for (idx = 0 ; idx < num_procs; idx++)

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository