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

BUG: luaL_checkudata may show wrong error message

This commit is contained in:
Roberto Ierusalimschy 2006-03-21 16:31:09 -03:00
parent 1ae0b6c0bf
commit 0238a0b01e
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bugs
View File

@ -839,3 +839,41 @@ patch = [[
} }
Bug{
what = [[luaL_checkudata may produce wrong error message]],
report = [[Greg Falcon, 21/03/2006]],
example = [[
getmetatable(io.stdin).__gc()
--> bad argument #1 to '__gc' (FILE* expected, got table)
]],
patch = [[
* lauxlib.c:
@@ -123,11 +123,17 @@
LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
void *p = lua_touserdata(L, ud);
- lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */
- if (p == NULL || !lua_getmetatable(L, ud) || !lua_rawequal(L, -1, -2))
- luaL_typerror(L, ud, tname);
- lua_pop(L, 2); /* remove both metatables */
- return p;
+ if (p != NULL) { /* value is a userdata? */
+ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
+ lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */
+ if (lua_rawequal(L, -1, -2)) { /* does it have the correct mt? */
+ lua_pop(L, 2); /* remove both metatables */
+ return p;
+ }
+ }
+ }
+ luaL_typerror(L, ud, tname); /* else error */
+ return NULL; /* to avoid warnings */
}
]]
}

18
lauxlib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lauxlib.c,v 1.157 2005/12/29 15:32:11 roberto Exp roberto $ ** $Id: lauxlib.c,v 1.158 2006/01/16 12:42:21 roberto Exp roberto $
** Auxiliary functions for building Lua libraries ** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -123,11 +123,17 @@ LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
void *p = lua_touserdata(L, ud); void *p = lua_touserdata(L, ud);
lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */ if (p != NULL) { /* value is a userdata? */
if (p == NULL || !lua_getmetatable(L, ud) || !lua_rawequal(L, -1, -2)) if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
luaL_typerror(L, ud, tname); lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */
lua_pop(L, 2); /* remove both metatables */ if (lua_rawequal(L, -1, -2)) { /* does it have the correct mt? */
return p; lua_pop(L, 2); /* remove both metatables */
return p;
}
}
}
luaL_typerror(L, ud, tname); /* else error */
return NULL; /* to avoid warnings */
} }