Fix error handling when indexing a lane with unexpected data

2 files changed, 18 insertions, 6 deletions

diff --git a/src/lane.cpp b/src/lane.cpp
index 17c4126..a998e9c 100644
--- a/src/lane.cpp
+++ b/src/lane.cpp
@@ -352,10 +352,20 @@ static LUAG_FUNC(thread_index)
 
     default: // unknown key
         lua_getmetatable(L_, kSelf);                                                               // L_: mt
-        std::ignore = luaG_getfield(L_, -1, "cached_error");                                       // L_: mt error
-        luaG_pushstring(L_, "Unknown key: ");                                                      // L_: mt error "Unknown key: "
-        lua_pushvalue(L_, kKey);                                                                   // L_: mt error "Unknown key: " k
-        lua_concat(L_, 2);                                                                         // L_: mt error "Unknown key: <k>"
+        kCachedError.pushKey(L_);                                                                  // L_: mt kCachedError
+        lua_rawget(L_, -2);                                                                        // L_: mt error()
+        if (luaG_type(L_, -1) != LuaType::FUNCTION) {
+            raise_luaL_error(L_, "INTERNAL ERROR: cached error() is a %s, not a function", luaG_typename(L_, -1).data());
+        }
+        luaG_pushstring(L_, "Unknown key: ");                                                      // L_: mt error() "Unknown key: "
+        kCachedTostring.pushKey(L_);                                                               // L_: mt error() "Unknown key: " kCachedTostring
+        lua_rawget(L_, -4);                                                                        // L_: mt error() "Unknown key: " tostring()
+        if (luaG_type(L_, -1) != LuaType::FUNCTION) {
+            raise_luaL_error(L_, "INTERNAL ERROR: cached tostring() is a %s, not a function", luaG_typename(L_, -1).data());
+        }
+        lua_pushvalue(L_, kKey);                                                                   // L_: mt error() "Unknown key: " tostring() k
+        lua_call(L_, 1, 1);                                                                        // L_: mt error() "Unknown key: " "k"
+        lua_concat(L_, 2);                                                                         // L_: mt error() "Unknown key: <k>"
         lua_call(L_, 1, 0); // error( "Unknown key: " .. key) -> doesn't return                    // L_: mt
         raise_luaL_error(L_, "%s[%s]: should not get here!", _lane->debugName.data(), luaG_typename(L_, kKey).data());
     }
@@ -965,7 +975,7 @@ namespace {
     } // namespace local
 } // namespace
 
-  // contains keys: { __gc, __index, cached_error, cached_tostring, cancel, join, get_debug_threadname }
+  // contains keys: { __close, __gc, __index, kCachedError, kCachedTostring, cancel, get_debug_threadname, join }
 void Lane::PushMetatable(lua_State* L_)
 {
     STACK_CHECK_START_REL(L_, 0);
diff --git a/tests/basic.lua b/tests/basic.lua
index ae8ebd9..6282e3e 100644
--- a/tests/basic.lua
+++ b/tests/basic.lua
@@ -92,6 +92,8 @@ local task_launch= lanes_gen("", { globals={hey=true}, gc_cb = gc_cb}, task)
 -- 'task_launch' is a factory of multithreaded tasks, we can launch several:
 
 local lane1= task_launch(100,200,3)
+assert.fails(function() print(lane1[lane1]) end) -- indexing the lane with anything other than a string or a number should fail
+
 local lane2= task_launch(200,300,4)
 
 -- At this stage, states may be "pending", "running" or "done"
@@ -435,7 +437,7 @@ local function chunk2(linda)
     assert(config.strip_functions and info.short_src=="?" or string.match(info.short_src, "^.*basic.lua$"), "bad info.short_src")
     -- These vary so let's not be picky (they're there..)
     --
-    assert(info.linedefined == 420, "bad linedefined")   -- start of 'chunk2'
+    assert(info.linedefined == 422, "bad linedefined")   -- start of 'chunk2'
     assert(config.strip_functions and info.currentline==-1 or info.currentline > info.linedefined, "bad currentline")   -- line of 'debug.getinfo'
     assert(info.lastlinedefined > info.currentline, "bad lastlinedefined")   -- end of 'chunk2'
     local k,func= linda:receive("down")