Eliminate seg fault for recursive print

Author: skuntz

src/sst/core/impl/interactive/simpleDebug.cc

@@ -743,41 +743,34 @@ SimpleDebugger::cmd_print(std::vector<std::string>& tokens)
     // See if have a -r or not
     int         recurse = 0;
     std::string tok     = tokens[1];
-    if ( tok.size() >= 2 && tok[0] == '-' && tok[1] == 'r' ) {
+    if ( (tok.size() >= 2) && (tok[0] == '-') && (tok[1] == 'r') ) {
         // Got a -r
-        std::string num = tok.substr(2);
-        if ( num.size() != 0 ) {
-            try {
-                recurse = SST::Core::from_string<int>(num);
-            }
-            catch ( std::invalid_argument& e ) {
-                printf("Invalid number format specified with -r: %s\n", tok.c_str());
-                return;
+        if (tok.size() == 2) {
+            recurse = 4;
+        } else {
+            std::string num = tok.substr(2);
+            if (num.size() != 0) {
+                try {
+                    recurse = SST::Core::from_string<int>(num);
+                }
+                catch (std::invalid_argument& e) {
+                    printf("Invalid number format specified with -r: %s\n", tok.c_str());
+                    return;
+                }
             }
         }
-        else {
-            recurse = 4; // default -r depth
-        }
-
         var_index = 2;
     }
 
-    if ( tokens.size() == var_index ) {
-        // Print current object
-        obj_->list(recurse);
-        return;
-    }
-
     if ( tokens.size() != (var_index + 1) ) {
         printf("Invalid format for print command (print [-rN] [<obj>])\n");
         return;
     }
 
     bool        found;
     std::string listing = obj_->listVariable(tokens[var_index], found, recurse);
-
     if ( !found ) {
-        printf("Unknown object in print command: %s\n", tokens[1].c_str());
+        printf("Unknown object in print command: %s\n", tokens[var_index].c_str());
         return;
     }
     else {

src/sst/core/serialization/objectMap.cc

@@ -176,13 +176,15 @@ ObjectMap::demangle_name(const char* name)
 std::string
 ObjectMap::listVariable(std::string name, bool& found, int recurse)
 {
+    auto& vars = getVariables();
     ObjectMap* var = findVariable(name);
     if ( nullptr == var ) {
         found = false;
         return "";
     }
     found = true;
 
+
     std::string ret;
 
     // Check to see if this is a loopback
@@ -213,7 +215,6 @@ ObjectMap::listRecursive(const std::string& name, int level, int recurse)
         ret = format_string("%s%s = %s (%s)\n", indent.c_str(), name.c_str(), get().c_str(), getType().c_str());
         return ret;
     }
-
     ret = format_string("%s%s (%s)\n", indent.c_str(), name.c_str(), getType().c_str());
 
     if ( level <= recurse ) {