From f17c17b8c755dee2bccda38de0603b1c95279599 Mon Sep 17 00:00:00 2001
From: zixun <lvzixun@gmail.com>
Date: Mon, 21 Oct 2019 11:38:08 +0800
Subject: [PATCH] fix match intern mt and stackvalues

---
 lualib-src/lua-sharetable.c  | 10 ++++----
 lualib/skynet/sharetable.lua | 45 ++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/lualib-src/lua-sharetable.c b/lualib-src/lua-sharetable.c
index dcfd460d..d74d1e3a 100644
--- a/lualib-src/lua-sharetable.c
+++ b/lualib-src/lua-sharetable.c
@@ -92,17 +92,15 @@ lco_stackvalues(lua_State* L) {
         luaL_checktype(L, 2, LUA_TTABLE);
         n = lua_gettop(cL);
         if(n > 0) {
-            lua_checkstack(L, n+1);
+            luaL_checkstack(L, n+1, NULL);
             int top = lua_gettop(L);
             lua_xmove(cL, L, n);
             int i=0;
-            for(i=0; i<n; i++) {
-                lua_pushvalue(L, top+1+i);
-                lua_seti(L, 2, i+1);
+            for(i=1; i<=n; i++) {
+                lua_pushvalue(L, top+i);
+                lua_seti(L, 2, i);
             }
             lua_xmove(L, cL, n);
-        } else {
-            n = 0;
         }
     }
 
diff --git a/lualib/skynet/sharetable.lua b/lualib/skynet/sharetable.lua
index 87829b3e..1faf4118 100644
--- a/lualib/skynet/sharetable.lua
+++ b/lualib/skynet/sharetable.lua
@@ -275,23 +275,40 @@ local function resolve_replace(replace_map)
     end
 
     local function match_mt(v)
-        local mt = getmetatable(v)
+        local mt = debug.getmetatable(v)
         if mt then
             local nv = replace_map[mt]
             if nv then
                 nv = getnv(mt)
-                setmetatable(v, nv)
+                debug.setmetatable(v, nv)
             else
                 match_value(mt)
             end
         end
     end
 
+    local function match_internmt()
+        local internal_types = {
+            pointer = debug.upvalueid(getnv, 1),
+            boolean = false,
+            str = "",
+            number = 42,
+            thread = coroutine.running(),
+            func = getnv,
+        }
+        for _,v in pairs(internal_types) do
+            match_mt(v)
+        end
+        match_mt(nil)
+    end
+
+
     local function match_table(t)
-        local keys = {}
+        local keys = false
         for k,v in next, t do
             local tk = type(k)
             if match[tk] then
+                keys = keys or {}
                 keys[#keys+1] = k
             end
 
@@ -304,17 +321,19 @@ local function resolve_replace(replace_map)
             end
         end
 
-        for _, old_k in ipairs(keys) do
-            local new_k = replace_map[old_k]
-            if new_k then
-                local value = rawget(t, old_k)
-                new_k = getnv(old_k)
-                rawset(t, old_k, nil)
+        if keys then
+            for _, old_k in ipairs(keys) do
+                local new_k = replace_map[old_k]
                 if new_k then
-                    rawset(t, new_k, value)
+                    local value = rawget(t, old_k)
+                    new_k = getnv(old_k)
+                    rawset(t, old_k, nil)
+                    if new_k then
+                        rawset(t, new_k, value)
+                    end
+                else
+                    match_value(old_k)
                 end
-            else
-                match_value(old_k)
             end
         end
         match_mt(t)
@@ -414,6 +433,8 @@ local function resolve_replace(replace_map)
     match["userdata"] = match_userdata
     match["thread"] = match_thread
 
+    match_internmt()
+
     local root = debug.getregistry()
     assert(replace_map[root] == nil)
     match_table(root)