From 343e367fb8c6550392bf46bcbe2390782292cd2e Mon Sep 17 00:00:00 2001
From: Nathan Glenn <garfieldnate@gmail.com>
Date: Wed, 23 Aug 2023 17:17:27 -0500
Subject: [PATCH] harden smem export

Harden the logic for exporting smem to prevent segfaults. Previously we had a
segfault with just `smem -x file.soar` because the smem DB is not connected.
Adding an LTI option, however, would connect to the DB first. Change it so that
export (as with backup) requires connecting to the DB first, and gracefully
returns false if not connected.
---
 Core/CLI/src/cli_load_save.cpp                |  3 ++
 Core/CLI/src/cli_smem.cpp                     | 48 +++----------------
 .../src/semantic_memory/smem_print.cpp        |  4 ++
 3 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/Core/CLI/src/cli_load_save.cpp b/Core/CLI/src/cli_load_save.cpp
index e15bd3dec4..8da081ee5f 100644
--- a/Core/CLI/src/cli_load_save.cpp
+++ b/Core/CLI/src/cli_load_save.cpp
@@ -212,6 +212,9 @@ bool CommandLineInterface::DoSave(std::vector<std::string>& argv, const std::str
             if (thisAgent->SMem->connected() && (thisAgent->SMem->statistics->nodes->get_value() > 0))
             {
                 result = thisAgent->SMem->export_smem(0, export_text, &(err));
+                if (!result) {
+                    SetError(*err);
+                }
                 AddSaveText("# Semantic Memory\n");
                 if (!DoCLog(LOG_ADD, 0, &export_text, true)) return false;
             } else {
diff --git a/Core/CLI/src/cli_smem.cpp b/Core/CLI/src/cli_smem.cpp
index e7124e4529..c1b3ace747 100644
--- a/Core/CLI/src/cli_smem.cpp
+++ b/Core/CLI/src/cli_smem.cpp
@@ -403,14 +403,13 @@ bool CommandLineInterface::DoSMem(const char pOp, const std::string* pArg1, cons
         std::string* err = new std::string("");
         uint64_t lti_id = NIL;
 
-        if (pArg2)
+        if (!thisAgent->SMem->connected())
         {
-            thisAgent->SMem->attach();
-            if (!thisAgent->SMem->connected())
-            {
-                return SetError("Semantic memory database not connected.");
-            }
+            return SetError("Cannot export smem: smem database not connected.");
+        }
 
+        if (pArg2)
+        {
             const char* pAttr_c_str = pArg2->c_str();
             soar::Lexer lexer(thisAgent, pAttr_c_str);
             if (!lexer.get_lexeme()) return SetError("LTI not found.");
@@ -456,41 +455,8 @@ bool CommandLineInterface::DoSMem(const char pOp, const std::string* pArg1, cons
                 return false;
             }
 
-            PrintCLIMessage("Exported semantic memory to file.");
-        }
-        delete err;
-        return result;
-    }
-    else if (pOp == 'x')
-    {
-        std::string* err = new std::string("smem_export.soar");
-        uint64_t lti_id = NIL;
-
-        std::string export_text;
-        bool result = thisAgent->SMem->export_smem(0, export_text, &(err));
-
-        if (!result)
-        {
-            SetError(*err);
-        }
-        else
-        {
-            if (!DoCLog(LOG_NEW, err, 0, true))
-            {
-                return false;
-            }
-
-            if (!DoCLog(LOG_ADD, 0, &export_text, true))
-            {
-                return false;
-            }
-
-            if (!DoCLog(LOG_CLOSE, 0, 0, true))
-            {
-                return false;
-            }
-
-            PrintCLIMessage("Exported semantic memory to file.");
+            tempString << "Exported semantic memory to file '" << pArg1->c_str() << "'.";
+            PrintCLIMessage(&tempString);
         }
         delete err;
         return result;
diff --git a/Core/SoarKernel/src/semantic_memory/smem_print.cpp b/Core/SoarKernel/src/semantic_memory/smem_print.cpp
index 57ef043b9b..38d32f0776 100644
--- a/Core/SoarKernel/src/semantic_memory/smem_print.cpp
+++ b/Core/SoarKernel/src/semantic_memory/smem_print.cpp
@@ -16,6 +16,10 @@
 bool SMem_Manager::export_smem(uint64_t lti_id, std::string& result_text, std::string** err_msg)
 {
     ltm_set store_set;
+    if (!connected()) {
+        (*err_msg)->append("Cannot export semantic memory if it is not connected.");
+        return false;
+    }
 
     if (!lti_id)
     {