From 730390248c5453b7757f349f8475dd96ea6d68a9 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Tue, 28 May 2024 14:44:23 -0700 Subject: [PATCH 1/2] Fixes proj segfault if a match cube is provided --- isis/src/base/apps/noproj/noproj.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp index c764b7f448..746b8395b6 100644 --- a/isis/src/base/apps/noproj/noproj.cpp +++ b/isis/src/base/apps/noproj/noproj.cpp @@ -46,12 +46,12 @@ namespace Isis { } icube.open(ui.GetCubeName("FROM")); - Cube *mcube = NULL; + Cube mcube; if((ui.WasEntered("MATCH"))) { - mcube->open(ui.GetCubeName("MATCH")); + mcube.open(ui.GetCubeName("MATCH")); } - noproj(&icube, mcube, ui); + noproj(&icube, &mcube, ui); } /** From 0985cd5be855bfc12e4bd69870bbe1eed115fa8a Mon Sep 17 00:00:00 2001 From: acpaquette Date: Tue, 28 May 2024 16:59:38 -0700 Subject: [PATCH 2/2] Revert mcube back into a pointer and correctly handle it --- isis/src/base/apps/noproj/noproj.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp index 746b8395b6..c35bdf97f7 100644 --- a/isis/src/base/apps/noproj/noproj.cpp +++ b/isis/src/base/apps/noproj/noproj.cpp @@ -46,12 +46,14 @@ namespace Isis { } icube.open(ui.GetCubeName("FROM")); - Cube mcube; + Cube *mcube = NULL; if((ui.WasEntered("MATCH"))) { - mcube.open(ui.GetCubeName("MATCH")); + mcube = new Cube(ui.GetCubeName("MATCH")); } - noproj(&icube, &mcube, ui); + noproj(&icube, mcube, ui); + + free(mcube); } /**