]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: fix null deref setting message connection ref
authorSage Weil <sage@newdream.net>
Thu, 17 Sep 2009 17:41:07 +0000 (10:41 -0700)
committerSage Weil <sage@newdream.net>
Thu, 17 Sep 2009 17:41:07 +0000 (10:41 -0700)
src/msg/SimpleMessenger.cc

index ca7c092c260f4ea89dbbcb7ecc7d2bbaab4dbfd4..3d6b09085cf1a1f1259575f16c0633940d0db3e5 100644 (file)
@@ -1304,8 +1304,6 @@ void SimpleMessenger::Pipe::reader()
       dout(20) << "reader got MSG" << dendl;
       Message *m = read_message();
 
-      m->set_connection(connection_state->get());
-
       lock.Lock();
       
       if (!m) {
@@ -1318,6 +1316,8 @@ void SimpleMessenger::Pipe::reader()
          state == STATE_CONNECTING)
        continue;
 
+      m->set_connection(connection_state->get());
+
       // check received seq#
       if (m->get_seq() <= in_seq) {
        dout(-10) << "reader got old message "