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

computations in numerical for loop must avoid overflows too

This commit is contained in:
Roberto Ierusalimschy 2015-07-04 13:31:03 -03:00
parent 6a8400ba4f
commit 319ccfefbc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.245 2015/06/09 15:53:35 roberto Exp roberto $ ** $Id: lvm.c,v 2.246 2015/06/25 14:00:01 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -1139,7 +1139,7 @@ void luaV_execute (lua_State *L) {
vmcase(OP_FORLOOP) { vmcase(OP_FORLOOP) {
if (ttisinteger(ra)) { /* integer loop? */ if (ttisinteger(ra)) { /* integer loop? */
lua_Integer step = ivalue(ra + 2); lua_Integer step = ivalue(ra + 2);
lua_Integer idx = ivalue(ra) + step; /* increment index */ lua_Integer idx = intop(+, ivalue(ra), step); /* increment index */
lua_Integer limit = ivalue(ra + 1); lua_Integer limit = ivalue(ra + 1);
if ((0 < step) ? (idx <= limit) : (limit <= idx)) { if ((0 < step) ? (idx <= limit) : (limit <= idx)) {
ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
@ -1171,7 +1171,7 @@ void luaV_execute (lua_State *L) {
/* all values are integer */ /* all values are integer */
lua_Integer initv = (stopnow ? 0 : ivalue(init)); lua_Integer initv = (stopnow ? 0 : ivalue(init));
setivalue(plimit, ilimit); setivalue(plimit, ilimit);
setivalue(init, initv - ivalue(pstep)); setivalue(init, intop(-, initv, ivalue(pstep)));
} }
else { /* try making all values floats */ else { /* try making all values floats */
lua_Number ninit; lua_Number nlimit; lua_Number nstep; lua_Number ninit; lua_Number nlimit; lua_Number nstep;