Skip to content

Free G4World's G4Volume wrappers; forbid copy/move to avoid double-free #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maureeungaro merged 1 commit into from
Jun 13, 2026
Merged

Free G4World's G4Volume wrappers; forbid copy/move to avoid double-free #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions gemc/g4system/g4world.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ class G4World : public GBase<G4World>
*/
G4World(const GWorld* gworld, const std::shared_ptr<GOptions>& gopts);

/// Frees the owned G4Volume wrappers. Geant4 owns the contained solid/logical/physical
/// objects, so only the lightweight wrappers allocated by the object factories are deleted.
~G4World() {
for (auto& [name, vol] : g4volumesMap) { delete vol; }
}

// G4World now owns the raw G4Volume* wrappers (freed in the destructor). It is only ever held
// by shared_ptr, so forbid copy/move to avoid a shallow copy double-freeing the wrappers.
G4World(const G4World&) = delete;
G4World& operator=(const G4World&) = delete;
G4World(G4World&&) = delete;
G4World& operator=(G4World&&) = delete;

// ────── lookup / mutators ────────────────────────────────────────

/**
Expand Down