gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up memory allocator initialization and catch early OOM.

Browse Source
This commit is contained in:
Mike Pall 2011-05-30 01:32:50 +02:00
parent 638f968978
commit 03b5c8c935
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib_aux.c
View File

@ -312,6 +312,13 @@ LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
/* -- Default allocator and panic function -------------------------------- */ /* -- Default allocator and panic function -------------------------------- */
static int panic(lua_State *L)
{
fprintf(stderr, "PANIC: unprotected error in call to Lua API (%s)\n",
lua_tostring(L, -1));
return 0;
}
#ifdef LUAJIT_USE_SYSMALLOC #ifdef LUAJIT_USE_SYSMALLOC
#if LJ_64 #if LJ_64
@ -330,30 +337,26 @@ static void *mem_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
} }
} }
#define mem_create() NULL LUALIB_API lua_State *luaL_newstate(void)
{
lua_State *L = lua_newstate(mem_alloc, NULL);
if (L) G(L)->panic = panic;
return L;
}
#else #else
#include "lj_alloc.h" #include "lj_alloc.h"
#define mem_alloc lj_alloc_f
#define mem_create lj_alloc_create
#endif
static int panic(lua_State *L)
{
fprintf(stderr, "PANIC: unprotected error in call to Lua API (%s)\n",
lua_tostring(L, -1));
return 0;
}
LUALIB_API lua_State *luaL_newstate(void) LUALIB_API lua_State *luaL_newstate(void)
{ {
lua_State *L;
void *ud = lj_alloc_create();
if (ud == NULL) return NULL;
#if LJ_64 #if LJ_64
lua_State *L = lj_state_newstate(mem_alloc, mem_create()); L = lj_state_newstate(lj_alloc_f, ud);
#else #else
lua_State *L = lua_newstate(mem_alloc, mem_create()); L = lua_newstate(lj_alloc_f, ud);
#endif #endif
if (L) G(L)->panic = panic; if (L) G(L)->panic = panic;
return L; return L;
@ -368,3 +371,5 @@ LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
} }
#endif #endif
#endif