diff options
author | Benoit Giannangeli <giann008@gmail.com> | 2017-05-12 08:20:15 +0200 |
---|---|---|
committer | Benoit Giannangeli <giann008@gmail.com> | 2017-05-12 08:20:15 +0200 |
commit | 4cccf8c6b2c2b1af0afafef52bc87477ba7f817a (patch) | |
tree | 9f0877a173a72c6d2b6575d0fea2384474e82cc3 /src | |
parent | f67e32773d85134a919b93a2394fcb7b585b5c6e (diff) | |
download | fengari-4cccf8c6b2c2b1af0afafef52bc87477ba7f817a.tar.gz fengari-4cccf8c6b2c2b1af0afafef52bc87477ba7f817a.tar.bz2 fengari-4cccf8c6b2c2b1af0afafef52bc87477ba7f817a.zip |
luaV_concat: 'total' should not be used inside the loop
If there's a table in the concat sequence, we ended up with a toconcat
array with undefined slots.
Diffstat (limited to 'src')
-rw-r--r-- | src/lvm.js | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -973,14 +973,13 @@ const luaV_concat = function(L, total) { delete L.stack[top - 1]; } else { /* at least two non-empty string values; get as many as possible */ - let toconcat = new Array(total); - toconcat[total-1] = L.stack[top-1].svalue(); + let concatenated = L.stack[top-1].svalue(); delete L.stack[top - 1]; for (n = 1; n < total && tostring(L, top - n - 1); n++) { - toconcat[total-n-1] = L.stack[top - n - 1].svalue(); + concatenated = L.stack[top - n - 1].svalue().concat(concatenated); delete L.stack[top - n - 1]; } - let ts = lstring.luaS_bless(L, Array.prototype.concat.apply([], toconcat)); + let ts = lstring.luaS_bless(L, concatenated); L.stack[top - n] = new lobject.TValue(CT.LUA_TLNGSTR, ts); } total -= n - 1; /* got 'n' strings to create 1 new */ |