Merge pull request #46128 from Dr15Jones/fixPythia8Interface

Protect getenv in Pythia8Interface
cms-sw · Oct 11, 2024 · 6da1102 · 6da1102
2 parents 6d1fe16 + 08550d4
commit 6da1102
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/GeneratorInterface/Pythia8Interface/src/Py8HMC3InterfaceBase.cc b/GeneratorInterface/Pythia8Interface/src/Py8HMC3InterfaceBase.cc
@@ -27,7 +27,11 @@ namespace gen {
 
     if (ps.exists("useEvtGenPlugin")) {
       useEvtGen = true;
-      string evtgenpath(std::getenv("EVTGENDATA"));
+      auto env = std::getenv("EVTGENDATA");
+      if (not env) {
+        throw cms::Exception("EvtGenMissingEnv") << "The environment variable EVTGENDATA must be defined";
+      }
+      string evtgenpath(env);
       evtgenDecFile = evtgenpath + string("/DECAY_2010.DEC");
       evtgenPdlFile = evtgenpath + string("/evt.pdl");
 

diff --git a/GeneratorInterface/Pythia8Interface/src/Py8InterfaceBase.cc b/GeneratorInterface/Pythia8Interface/src/Py8InterfaceBase.cc
@@ -31,7 +31,11 @@ namespace gen {
 
     if (ps.exists("useEvtGenPlugin")) {
       useEvtGen = true;
-      string evtgenpath(std::getenv("EVTGENDATA"));
+      auto env = std::getenv("EVTGENDATA");
+      if (not env) {
+        throw cms::Exception("EvtGenMissingEnv") << "The environment variable EVTGENDATA must be defined";
+      }
+      string evtgenpath(env);
       evtgenDecFile = evtgenpath + string("/DECAY_2010.DEC");
       evtgenPdlFile = evtgenpath + string("/evt.pdl");