diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2022-08-24 17:36:47 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2022-08-24 17:36:47 -0300 |
commit | 997f11f54322883c3181225f29d101a597f31730 (patch) | |
tree | 22628b0ca4632fea24e279bc8ea1cc103a15bcb5 /lparser.c | |
parent | 02060b7a37d88d4e92cf64a008c0651eae432c12 (diff) | |
download | lua-997f11f54322883c3181225f29d101a597f31730.tar.gz lua-997f11f54322883c3181225f29d101a597f31730.tar.bz2 lua-997f11f54322883c3181225f29d101a597f31730.zip |
Bug: 'break' may not properly close variable in a 'for' loop
Function 'leaveblock' was generating "break" label before removing
variables from the closing block. If 'createlabel' created a 'close'
instruction (which it did when matching a goto/break that exited
the scope of an upvalue), that instruction would use the wrong level.
Diffstat (limited to 'lparser.c')
-rw-r--r-- | lparser.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -674,19 +674,19 @@ static void leaveblock (FuncState *fs) { | |||
674 | LexState *ls = fs->ls; | 674 | LexState *ls = fs->ls; |
675 | int hasclose = 0; | 675 | int hasclose = 0; |
676 | int stklevel = reglevel(fs, bl->nactvar); /* level outside the block */ | 676 | int stklevel = reglevel(fs, bl->nactvar); /* level outside the block */ |
677 | if (bl->isloop) /* fix pending breaks? */ | 677 | removevars(fs, bl->nactvar); /* remove block locals */ |
678 | lua_assert(bl->nactvar == fs->nactvar); /* back to level on entry */ | ||
679 | if (bl->isloop) /* has to fix pending breaks? */ | ||
678 | hasclose = createlabel(ls, luaS_newliteral(ls->L, "break"), 0, 0); | 680 | hasclose = createlabel(ls, luaS_newliteral(ls->L, "break"), 0, 0); |
679 | if (!hasclose && bl->previous && bl->upval) | 681 | if (!hasclose && bl->previous && bl->upval) /* still need a 'close'? */ |
680 | luaK_codeABC(fs, OP_CLOSE, stklevel, 0, 0); | 682 | luaK_codeABC(fs, OP_CLOSE, stklevel, 0, 0); |
681 | fs->bl = bl->previous; | ||
682 | removevars(fs, bl->nactvar); | ||
683 | lua_assert(bl->nactvar == fs->nactvar); | ||
684 | fs->freereg = stklevel; /* free registers */ | 683 | fs->freereg = stklevel; /* free registers */ |
685 | ls->dyd->label.n = bl->firstlabel; /* remove local labels */ | 684 | ls->dyd->label.n = bl->firstlabel; /* remove local labels */ |
686 | if (bl->previous) /* inner block? */ | 685 | fs->bl = bl->previous; /* current block now is previous one */ |
687 | movegotosout(fs, bl); /* update pending gotos to outer block */ | 686 | if (bl->previous) /* was it a nested block? */ |
687 | movegotosout(fs, bl); /* update pending gotos to enclosing block */ | ||
688 | else { | 688 | else { |
689 | if (bl->firstgoto < ls->dyd->gt.n) /* pending gotos in outer block? */ | 689 | if (bl->firstgoto < ls->dyd->gt.n) /* still pending gotos? */ |
690 | undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */ | 690 | undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */ |
691 | } | 691 | } |
692 | } | 692 | } |