rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lua_getmetatable must accept any acceptable index

This commit is contained in:
Roberto Ierusalimschy 2003-04-07 11:36:08 -03:00
parent 2ad947fe03
commit d1df829f8d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lapi.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 1.233 2003/03/14 18:59:21 roberto Exp roberto $ ** $Id: lapi.c,v 1.234 2003/04/03 13:35:34 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -370,6 +370,7 @@ LUA_API const void *lua_topointer (lua_State *L, int idx) {
switch (ttype(o)) { switch (ttype(o)) {
case LUA_TTABLE: return hvalue(o); case LUA_TTABLE: return hvalue(o);
case LUA_TFUNCTION: return clvalue(o); case LUA_TFUNCTION: return clvalue(o);
case LUA_TTHREAD: return thvalue(o);
case LUA_TUSERDATA: case LUA_TUSERDATA:
case LUA_TLIGHTUSERDATA: case LUA_TLIGHTUSERDATA:
return lua_touserdata(L, idx); return lua_touserdata(L, idx);
@ -520,11 +521,12 @@ LUA_API void lua_newtable (lua_State *L) {
LUA_API int lua_getmetatable (lua_State *L, int objindex) { LUA_API int lua_getmetatable (lua_State *L, int objindex) {
StkId obj; const TObject *obj;
Table *mt; Table *mt = NULL;
int res; int res;
lua_lock(L); lua_lock(L);
obj = luaA_indexAcceptable(L, objindex); obj = luaA_indexAcceptable(L, objindex);
if (obj != NULL) {
switch (ttype(obj)) { switch (ttype(obj)) {
case LUA_TTABLE: case LUA_TTABLE:
mt = hvalue(obj)->metatable; mt = hvalue(obj)->metatable;
@ -532,10 +534,9 @@ LUA_API int lua_getmetatable (lua_State *L, int objindex) {
case LUA_TUSERDATA: case LUA_TUSERDATA:
mt = uvalue(obj)->uv.metatable; mt = uvalue(obj)->uv.metatable;
break; break;
default:
mt = hvalue(defaultmeta(L));
} }
if (mt == hvalue(defaultmeta(L))) }
if (mt == NULL || mt == hvalue(defaultmeta(L)))
res = 0; res = 0;
else { else {
sethvalue(L->top, mt); sethvalue(L->top, mt);