Merge pull request #243 from veprbl/pr/heisenbug

JFactoryPodioT: only delete shallow object in ClearData
JeffersonLab · Oct 2, 2023 · ab7069e · ab7069e
2 parents ea9ebf5 + fad0866
commit ab7069e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/libraries/JANA/Podio/JFactoryPodioT.h b/src/libraries/JANA/Podio/JFactoryPodioT.h
@@ -132,7 +132,12 @@ void JFactoryPodioT<T>::ClearData() {
     if (this->mStatus == JFactory::Status::Uninitialized) {
         return;
     }
-    for (auto p : this->mData) delete p;
+    for (auto p : this->mData) {
+      // Avoid potentially invalid call to ObjBase::release(). The frame and
+      // all the collections and all Obj may have been deallocated at this point.
+      p->unlink();
+      delete p;
+    }
     this->mData.clear();
     this->mCollection = nullptr;  // Collection is owned by the Frame, so we ignore here
     this->mFrame = nullptr;  // Frame is owned by the JEvent, so we ignore here