From 5ab27f256b885de7f13ee6313d0c194433ff6819 Mon Sep 17 00:00:00 2001 From: Daniel Britzger <daniel.britzger@cern.ch> Date: Mon, 9 Dec 2024 15:30:03 +0100 Subject: [PATCH] fix NULL when accessing instances of read_steer --- v2.6/toolkit/fastnlotoolkit/include/fastnlotk/read_steer.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/v2.6/toolkit/fastnlotoolkit/include/fastnlotk/read_steer.h b/v2.6/toolkit/fastnlotoolkit/include/fastnlotk/read_steer.h index 5eeefc27..3af31028 100644 --- a/v2.6/toolkit/fastnlotoolkit/include/fastnlotk/read_steer.h +++ b/v2.6/toolkit/fastnlotoolkit/include/fastnlotk/read_steer.h @@ -597,15 +597,19 @@ public: return read_steer::Steering(steerID)->getstcol(label,column); } // check existence of value static bool getexist(const std::string& label, std::string steerID=read_steer::stdID ){ + if ( read_steer::instances==NULL ) read_steer::instances = new std::map<string,read_steer*>(); if ( read_steer::instances->count(steerID) == 0 ) return false; return read_steer::Steering(steerID)->exist(label);} static bool getarrayexist(const std::string& label, std::string steerID=read_steer::stdID ){ + if ( read_steer::instances==NULL ) read_steer::instances = new std::map<string,read_steer*>(); if ( read_steer::instances->count(steerID) == 0 ) return false; return read_steer::Steering(steerID)->arrayexist(label);} static bool getarraycontainkey(const std::string& key, const std::string& label, std::string steerID=read_steer::stdID ){ + if ( read_steer::instances==NULL ) read_steer::instances = new std::map<string,read_steer*>(); if ( read_steer::instances->count(steerID) == 0 ) return false; return read_steer::Steering(steerID)->arraycontainkey(key, label);} static void arraypushback_steer(const std::string& value, const std::string& label, std::string steerID=read_steer::stdID ){ + if ( read_steer::instances==NULL ) read_steer::instances = new std::map<string,read_steer*>(); if ( read_steer::instances->count(steerID) == 0 ) return; read_steer::Steering(steerID)->arraypushback(value, label);} // add values -- GitLab