From 9b1709d7e2958dc0a7a1ad1c06f6ed5132963586 Mon Sep 17 00:00:00 2001 From: Marcin Nowak <Marcin.Nowak@cern.ch> Date: Tue, 10 Dec 2024 14:44:24 +0100 Subject: [PATCH] Do not ignore error code returned by RootAuxDynStore::readData() RootAuxDynStore::readData() returns false in case of error. Check this return code and if false, abort and return NULL --- .../AthenaRoot/RootAuxDynIO/src/RootAuxDynStore.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynStore.cxx b/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynStore.cxx index 1806a1df784b..4459b6b469b9 100644 --- a/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynStore.cxx +++ b/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynStore.cxx @@ -39,8 +39,9 @@ const SG::IAuxTypeVector* RootAuxDynStore::getVector(SG::auxid_t auxid) const const SG::IAuxTypeVector* ret = SG::AuxStoreInternal::getVector (auxid); if (!ret) { auto this_nc ATLAS_THREAD_SAFE = const_cast<RootAuxDynStore*>(this); // locked above - this_nc->readData(auxid); - ret = SG::AuxStoreInternal::getVector (auxid); + if( this_nc->readData(auxid) ) { + ret = SG::AuxStoreInternal::getVector (auxid); + } } return ret; } @@ -59,8 +60,9 @@ const void* RootAuxDynStore::getIOData(SG::auxid_t auxid) const const void* ret = SG::AuxStoreInternal::getIODataInternal (auxid, true); if (!ret) { auto this_nc ATLAS_THREAD_SAFE = const_cast<RootAuxDynStore*>(this); // locked above - this_nc->readData(auxid); - ret = SG::AuxStoreInternal::getIOData (auxid); + if( this_nc->readData(auxid) ) { + ret = SG::AuxStoreInternal::getIOData (auxid); + } } return ret; } -- GitLab