Merge pull request #26137 from Dr15Jones/fixMessageSender

Protect against accessing nullptr in MessageSender
cms-sw · Mar 11, 2019 · 61be00a · 61be00a
2 parents ce10e4b + a37379f
commit 61be00a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/FWCore/MessageLogger/src/MessageSender.cc b/FWCore/MessageLogger/src/MessageSender.cc
@@ -119,7 +119,7 @@ void MessageSender::ErrorObjDeleter::operator()(ErrorObj * errorObjPtr) {
 #endif
 								// change log 1
       if ( errorSummaryIsBeingKept.load(std::memory_order_acquire) &&
-           errorObjPtr->xid().severity >= ELwarning &&
+           errorObjPtr->xid().severity >= ELwarning && drop &&
           drop->streamID < std::numeric_limits<unsigned int>::max())
       {
         auto& errorSummaryMap =errorSummaryMaps[drop->streamID];