From ff8f64f1c0038bbf8001d956ce8e66814fcaaf91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrianna=20Pi=C5=84ska?= Date: Mon, 27 Jan 2025 15:42:13 +0200 Subject: [PATCH 1/3] Use a different method to set local and global sink without reusing a pointer it's not safe to reuse --- src/Main/Main.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Main/Main.cc b/src/Main/Main.cc index 58e28f26a..8f7c8b994 100644 --- a/src/Main/Main.cc +++ b/src/Main/Main.cc @@ -74,9 +74,8 @@ int main(int argc, char* argv[]) { default: carta_log_sink = new CartaLogSink(casacore::LogMessage::NORMAL); } - casacore::LogSink log_sink(carta_log_sink->filter(), std::shared_ptr(carta_log_sink)); casacore::LogSink::globalSink(carta_log_sink); - casacore::LogIO casacore_log(log_sink); + casacore::LogIO casacore_log; if (settings.wait_time >= 0) { Session::SetExitTimeout(settings.wait_time); From 13907c0dab93514b195022a968cf5bb565c663cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrianna=20Pi=C5=84ska?= Date: Mon, 27 Jan 2025 16:07:00 +0200 Subject: [PATCH 2/3] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51fa3fd10..606a78015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Fix save image/export regions bug which could cause directory overwrite or deletion ([#1377](https://github.com/CARTAvis/carta-backend/issues/1377)). * Fix bug in cache slicer transformation which affects some images with rotated axes ([#1389](https://github.com/CARTAvis/carta-backend/pull/1389)). * Fix bug accessing top (root) folder of file browser ([#2354](https://github.com/CARTAvis/carta-frontend/issues/2354)). +* Fix segfault after early exit ([#1382](https://github.com/CARTAvis/carta-backend/issues/1382)). ### Changed * Move the loader cache to separate files ([#1021](https://github.com/CARTAvis/carta-backend/issues/1021)). From 306182cbc4af5135258d46cc45b2dadfdfe57b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrianna=20Pi=C5=84ska?= Date: Thu, 30 Jan 2025 10:13:13 +0200 Subject: [PATCH 3/3] Remove unused local casacore log object --- src/Main/Main.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Main/Main.cc b/src/Main/Main.cc index 8f7c8b994..e1e965417 100644 --- a/src/Main/Main.cc +++ b/src/Main/Main.cc @@ -75,7 +75,6 @@ int main(int argc, char* argv[]) { carta_log_sink = new CartaLogSink(casacore::LogMessage::NORMAL); } casacore::LogSink::globalSink(carta_log_sink); - casacore::LogIO casacore_log; if (settings.wait_time >= 0) { Session::SetExitTimeout(settings.wait_time);