mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2025-01-04 08:34:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug: line hooks in stripped functions

Browse Source 
Line-hook handling was accessing debug info. without checking whether
it was present.
This commit is contained in:
Roberto Ierusalimschy 2020-07-27 13:23:05 -03:00
parent a585eae6e7
commit ae5b5ba529
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldebug.c
View File

@ -783,11 +783,13 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
** previous instruction 'oldpc'.
*/
static int changedline (const Proto *p, int oldpc, int newpc) {
if (p->lineinfo == NULL) /* no debug information? */
return 0;
while (oldpc++ < newpc) {
if (p->lineinfo[oldpc] != 0)
return (luaG_getfuncline(p, oldpc - 1) != luaG_getfuncline(p, newpc));
}
return 0; /* no line changes in the way */
return 0; /* no line changes between positions */
}

19
testes/db.lua
View File

@ -884,7 +884,7 @@ end
print("testing debug functions on chunk without debug info")
prog = [[-- program to be loaded without debug information
prog = [[-- program to be loaded without debug information (strip)
local debug = require'debug'
local a = 12 -- a local variable
@ -927,6 +927,23 @@ local f = assert(load(string.dump(load(prog), true)))
assert(f() == 13)
do -- bug in 5.4.0: line hooks in stripped code
local function foo ()
local a = 1
local b = 2
return b
end
local s = load(string.dump(foo, true))
local line = true
debug.sethook(function (e, l)
assert(e == "line")
line = l
end, "l")
assert(s() == 2); debug.sethook(nil)
assert(line == nil) -- hook called withoug debug info for 1st instruction
end
do -- tests for 'source' in binary dumps
local prog = [[
return function (x)