From b7af8d8bb0877c5febfe49c54668707fc3daffa6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 24 Aug 2012 20:12:26 -0700 Subject: [PATCH] msg/Message: fix possible null deref cct may be null CID 716930: Dereference after null check (FORWARD_NULL) At (11): Dereferencing null pointer "cct". Signed-off-by: Sage Weil --- src/msg/Message.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 7046dd257b2f..0c5a18566539 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -615,12 +615,14 @@ Message *decode_message(CephContext *cct, ceph_msg_header& header, ceph_msg_foot // it against compat_version. if (m->get_header().version && m->get_header().version < header.compat_version) { - ldout(cct, 0) << "will not decode message of type " << type - << " version " << header.version - << " because compat_version " << header.compat_version - << " > supported version " << m->get_header().version << dendl; - if (cct->_conf->ms_die_on_bad_msg) - assert(0); + if (cct) { + ldout(cct, 0) << "will not decode message of type " << type + << " version " << header.version + << " because compat_version " << header.compat_version + << " > supported version " << m->get_header().version << dendl; + if (cct->_conf->ms_die_on_bad_msg) + assert(0); + } m->put(); return 0; } -- 2.47.3