Merge pull request #26381 from Dr15Jones/fix_getTrackFromChargedHadron

Avoid null reference in getTrackFromChargedHadron
cms-sw · Apr 8, 2019 · 5e32e20 · 5e32e20
2 parents 418ada8 + ac6051b
commit 5e32e20
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/RecoTauTag/RecoTau/src/pfRecoTauChargedHadronAuxFunctions.cc b/RecoTauTag/RecoTau/src/pfRecoTauChargedHadronAuxFunctions.cc
@@ -14,11 +14,11 @@ const reco::Track* getTrackFromChargedHadron(const reco::PFRecoTauChargedHadron&
     return chargedHadron.getTrack().get();
   }
   // In MiniAOD, even isolated tracks are saved as candidates, so the track Ptr doesn't exist
-  const pat::PackedCandidate* chargedPFPCand = dynamic_cast<const pat::PackedCandidate*> (&*chargedHadron.getChargedPFCandidate());
+  const pat::PackedCandidate* chargedPFPCand = dynamic_cast<const pat::PackedCandidate*> (chargedHadron.getChargedPFCandidate().get());
   if (chargedPFPCand != nullptr) {
     return chargedPFPCand->bestTrack();
   }
-  const pat::PackedCandidate* lostTrackCand = dynamic_cast<const pat::PackedCandidate*> (&*chargedHadron.getLostTrackCandidate());
+  const pat::PackedCandidate* lostTrackCand = dynamic_cast<const pat::PackedCandidate*> (chargedHadron.getLostTrackCandidate().get());
   if (lostTrackCand != nullptr) {
     return lostTrackCand->bestTrack();
   }