[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b1-82-gc09f396

[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  c09f396958cbef74684c3b423315b972973042a5 (commit)
      from  4ef8d551fdaa38e636927cd38805d60fb13ede8d (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/c09f396958cbef74684c3b423315b972973042a5

commit c09f396958cbef74684c3b423315b972973042a5
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date:   Mon Apr 20 14:38:26 2015 -0500

    Moved a request assert to an earlier location
    
    An assert protecting from a non-null request was happening too late in pkt_COOKIE_handler from
    mpid_nem_lmt.c. This patch moves it to an earlier location so that it's checked before it's first
    used.
    
    Reported by Dmitry Polyakov.

diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c
index c07d322..60b782d 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c
@@ -462,13 +462,14 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz
 
     if (cookie_pkt->from_sender) {
         MPID_Request_get_ptr(cookie_pkt->receiver_req_id, req);
+        MPIU_Assert(req != NULL);
         req->ch.lmt_req_id = cookie_pkt->sender_req_id;
     }
     else {
         MPID_Request_get_ptr(cookie_pkt->sender_req_id, req);
+        MPIU_Assert(req != NULL);
         req->ch.lmt_req_id = cookie_pkt->receiver_req_id;
     }
-    MPIU_Assert(req != NULL);
 
     if (cookie_pkt->cookie_len != 0)
     {

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

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


hooks/post-receive
-- 
MPICH primary repository