summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenoit Giannangeli <giann008@gmail.com>2017-05-12 08:20:15 +0200
committerBenoit Giannangeli <giann008@gmail.com>2017-05-12 08:20:15 +0200
commit4cccf8c6b2c2b1af0afafef52bc87477ba7f817a (patch)
tree9f0877a173a72c6d2b6575d0fea2384474e82cc3 /src
parentf67e32773d85134a919b93a2394fcb7b585b5c6e (diff)
downloadfengari-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.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lvm.js b/src/lvm.js
index d86b783..542dd61 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -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 */