diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2024-01-25 13:52:52 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2024-01-25 13:52:52 -0300 |
commit | 108e0bdc8495782544c351b17eaae1411a910e89 (patch) | |
tree | 1196b9d9288b38b0be0290e30ec818fa09d06238 /lvm.c | |
parent | b34a97a4af5c9e973915c07dba918d95009e0acd (diff) | |
parent | e288c5a91883793d14ed9e9d93464f6ee0b08915 (diff) | |
download | lua-108e0bdc8495782544c351b17eaae1411a910e89.tar.gz lua-108e0bdc8495782544c351b17eaae1411a910e89.tar.bz2 lua-108e0bdc8495782544c351b17eaae1411a910e89.zip |
Merge branch 'master' into nextversion
Diffstat (limited to 'lvm.c')
-rw-r--r-- | lvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -655,7 +655,7 @@ void luaV_concat (lua_State *L, int total) { | |||
655 | /* collect total length and number of strings */ | 655 | /* collect total length and number of strings */ |
656 | for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) { | 656 | for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) { |
657 | size_t l = tsslen(tsvalue(s2v(top - n - 1))); | 657 | size_t l = tsslen(tsvalue(s2v(top - n - 1))); |
658 | if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) { | 658 | if (l_unlikely(l >= MAX_SIZE - sizeof(TString) - tl)) { |
659 | L->top.p = top - total; /* pop strings to avoid wasting stack */ | 659 | L->top.p = top - total; /* pop strings to avoid wasting stack */ |
660 | luaG_runerror(L, "string length overflow"); | 660 | luaG_runerror(L, "string length overflow"); |
661 | } | 661 | } |