From e9f397945dfe62093e881333b860e92384e6de96 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Tue, 10 May 2016 16:59:34 +0800
Subject: [PATCH] bugfix issue #494

---
 3rd/lua/lapi.c        | 10 +++++-----
 test/testmemlimit.lua | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/3rd/lua/lapi.c b/3rd/lua/lapi.c
index c8ee2df4..fdffdbe1 100644
--- a/3rd/lua/lapi.c
+++ b/3rd/lua/lapi.c
@@ -1012,10 +1012,9 @@ LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
   return status;
 }
 
-static Proto * cloneproto (lua_State *L, const Proto *src) {
+void cloneproto (lua_State *L, Proto *f, const Proto *src) {
   /* copy constants and nested proto */
   int i,n;
-  Proto *f = luaF_newproto(L, src->sp);
   n = src->sp->sizek;
   f->k=luaM_newvector(L,n,TValue);
   for (i=0; i<n; i++) setnilvalue(&f->k[i]);
@@ -1033,9 +1032,9 @@ static Proto * cloneproto (lua_State *L, const Proto *src) {
   f->p=luaM_newvector(L,n,struct Proto *);
   for (i=0; i<n; i++) f->p[i]=NULL;
   for (i=0; i<n; i++) {
-    f->p[i]=cloneproto(L, src->p[i]);
+    f->p[i]= luaF_newproto(L, src->p[i]->sp);
+	cloneproto(L, f->p[i], src->p[i]);
   }
-  return f;
 }
 
 LUA_API void lua_clonefunction (lua_State *L, const void * fp) {
@@ -1049,9 +1048,10 @@ LUA_API void lua_clonefunction (lua_State *L, const void * fp) {
     return;
   }
   cl = luaF_newLclosure(L,f->nupvalues);
-  cl->p = cloneproto(L, f->p);
   setclLvalue(L,L->top,cl);
   api_incr_top(L);
+  cl->p = luaF_newproto(L, f->p->sp);
+  cloneproto(L, cl->p, f->p);
   luaF_initupvals(L, cl);
 
   if (cl->nupvalues >= 1) {  /* does it have an upvalue? */
diff --git a/test/testmemlimit.lua b/test/testmemlimit.lua
index 41072dcc..66d972d1 100644
--- a/test/testmemlimit.lua
+++ b/test/testmemlimit.lua
@@ -1,17 +1,23 @@
 local skynet = require "skynet"
 
+local names = {"cluster", "dns", "mongo", "mysql", "redis", "sharedata", "socket", "sproto"}
+
 -- set sandbox memory limit to 1M, must set here (at start, out of skynet.start)
 skynet.memlimit(1 * 1024 * 1024)
 
 skynet.start(function()
-	local a = {}
-	local limit
-	local ok, err = pcall(function()
-		for i=1, 1000000 do
-			limit = i
-			table.insert(a, {})
-		end
-	end)
-	skynet.error(limit, err)
-	skynet.exit()
+    local a = {}
+    local limit
+    local ok, err = pcall(function()
+        for i=1, 12355 do
+            limit = i
+            table.insert(a, {})
+        end
+    end)
+    local libs = {}
+    for k,v in ipairs(names) do
+        libs[v] = require(v)
+    end
+    skynet.error(limit, err)
+    skynet.exit()
 end)