lua

A copy of the Lua development repository
Log | Files | Refs | README

commit cd0ebd0a802c55d1f16796d2fbb4a6623a6fda57
parent 8bc33a088c99c21493dee173fb394003f3331454
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Mon, 11 Oct 2010 17:24:18 -0300

'proto->source' may be NULL (if dump strips debug information)

Diffstat:
Mldebug.c | 16+++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ldebug.c b/ldebug.c @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.72 2010/06/21 16:30:12 roberto Exp roberto $ +** $Id: ldebug.c,v 2.73 2010/09/07 19:21:39 roberto Exp roberto $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -160,9 +160,10 @@ static void funcinfo (lua_Debug *ar, Closure *cl) { ar->what = "C"; } else { - ar->source = getstr(cl->l.p->source); - ar->linedefined = cl->l.p->linedefined; - ar->lastlinedefined = cl->l.p->lastlinedefined; + Proto *p = cl->l.p; + ar->source = p->source ? getstr(p->source) : "=?"; + ar->linedefined = p->linedefined; + ar->lastlinedefined = p->lastlinedefined; ar->what = (ar->linedefined == 0) ? "main" : "Lua"; } luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE); @@ -496,7 +497,12 @@ static void addinfo (lua_State *L, const char *msg) { if (isLua(ci)) { /* is Lua code? */ char buff[LUA_IDSIZE]; /* add file:line information */ int line = currentline(ci); - luaO_chunkid(buff, getstr(ci_func(ci)->l.p->source), LUA_IDSIZE); + TString *src = ci_func(ci)->l.p->source; + if (src) + luaO_chunkid(buff, getstr(src), LUA_IDSIZE); + else { /* no source available; use "?" instead */ + buff[0] = '?'; buff[1] = '\0'; + } luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); } }