From e3f8c25e9e45ce8357bad3457804a6dd438dbc4c Mon Sep 17 00:00:00 2001
From: Grant Hernandez <grant.h.hernandez@gmail.com>
Date: Wed, 3 Nov 2021 21:17:07 -0700
Subject: [PATCH] Fix CLI abort when non lua string passed to error (#114)

---
 CLI/Repl.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/CLI/Repl.cpp b/CLI/Repl.cpp
index 6baa21e..f57a500 100644
--- a/CLI/Repl.cpp
+++ b/CLI/Repl.cpp
@@ -169,7 +169,17 @@ static std::string runCode(lua_State* L, const std::string& source)
     }
     else
     {
-        std::string error = (status == LUA_YIELD) ? "thread yielded unexpectedly" : lua_tostring(T, -1);
+        std::string error;
+
+        if (status == LUA_YIELD)
+        {
+            error = "thread yielded unexpectedly";
+        }
+        else if (const char* str = lua_tostring(L, -1))
+        {
+            error = str;
+        }
+
         error += "\nstack backtrace:\n";
         error += lua_debugtrace(T);
 
@@ -322,7 +332,17 @@ static bool runFile(const char* name, lua_State* GL)
     }
     else
     {
-        std::string error = (status == LUA_YIELD) ? "thread yielded unexpectedly" : lua_tostring(L, -1);
+        std::string error;
+
+        if (status == LUA_YIELD)
+        {
+            error = "thread yielded unexpectedly";
+        }
+        else if (const char* str = lua_tostring(L, -1))
+        {
+            error = str;
+        }
+
         error += "\nstacktrace:\n";
         error += lua_debugtrace(L);