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

Fix handling of err_loc() within cpcall frames.

Browse Source
This commit is contained in:
Mike Pall 2011-03-09 22:39:17 +01:00
parent 0125ee8211
commit 30cc4d3bba
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lj_err.c
View File

@ -87,9 +87,10 @@ static BCPos currentpc(lua_State *L, GCfunc *fn, cTValue *nextframe)
if (!isluafunc(fn)) { /* Cannot derive a PC for non-Lua functions. */ if (!isluafunc(fn)) { /* Cannot derive a PC for non-Lua functions. */
return ~(BCPos)0; return ~(BCPos)0;
} else if (nextframe == NULL) { /* Lua function on top. */ } else if (nextframe == NULL) { /* Lua function on top. */
if (L->cframe == NULL) void *cf = cframe_raw(L->cframe);
if (cf == NULL || (char *)cframe_pc(cf) == (char *)cframe_L(cf))
return ~(BCPos)0; return ~(BCPos)0;
ins = cframe_Lpc(L); /* Only happens during error/hook handling. */ ins = cframe_pc(cf); /* Only happens during error/hook handling. */
} else { } else {
if (frame_islua(nextframe)) { if (frame_islua(nextframe)) {
ins = frame_pc(nextframe); ins = frame_pc(nextframe);
@ -815,11 +816,13 @@ LJ_NOINLINE static void err_loc(lua_State *L, const char *msg,
if (isluafunc(fn)) { if (isluafunc(fn)) {
char buff[LUA_IDSIZE]; char buff[LUA_IDSIZE];
BCLine line = currentline(L, fn, nextframe); BCLine line = currentline(L, fn, nextframe);
if (line >= 0) {
err_chunkid(buff, strdata(proto_chunkname(funcproto(fn)))); err_chunkid(buff, strdata(proto_chunkname(funcproto(fn))));
lj_str_pushf(L, "%s:%d: %s", buff, line, msg); lj_str_pushf(L, "%s:%d: %s", buff, line, msg);
return; return;
} }
} }
}
lj_str_pushf(L, "%s", msg); lj_str_pushf(L, "%s", msg);
} }