• R/O
  • SSH

aotus: 提交

Repository for the aotus library is now located at https://github.com/apes-suite/aotus


Commit MetaInfo

修訂a31931ecf1d2b4a583edd402abd79eb85479a2b0 (tree)
時間2022-08-31 16:20:35
作者Harald Klimach <harald.klimach@dlr....>
CommiterHarald Klimach

Log Message

Change Summary

差異

diff -r 39d8be88b1bb -r a31931ecf1d2 external/lua-5.4.4/src/ldebug.c
--- a/external/lua-5.4.4/src/ldebug.c Wed Aug 31 09:14:39 2022 +0200
+++ b/external/lua-5.4.4/src/ldebug.c Wed Aug 31 09:20:35 2022 +0200
@@ -824,8 +824,11 @@
824824 va_start(argp, fmt);
825825 msg = luaO_pushvfstring(L, fmt, argp); /* format message */
826826 va_end(argp);
827- if (isLua(ci)) /* if Lua function, add source:line information */
827+ if (isLua(ci)) { /* if Lua function, add source:line information */
828828 luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci));
829+ setobjs2s(L, L->top - 2, L->top - 1); /* remove 'msg' from the stack */
830+ L->top--;
831+ }
829832 luaG_errormsg(L);
830833 }
831834
diff -r 39d8be88b1bb -r a31931ecf1d2 external/lua-5.4.4/src/lvm.c
--- a/external/lua-5.4.4/src/lvm.c Wed Aug 31 09:14:39 2022 +0200
+++ b/external/lua-5.4.4/src/lvm.c Wed Aug 31 09:20:35 2022 +0200
@@ -656,8 +656,10 @@
656656 /* collect total length and number of strings */
657657 for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {
658658 size_t l = vslen(s2v(top - n - 1));
659- if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl))
659+ if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {
660+ L->top = top - total; /* pop strings to avoid wasting stack */
660661 luaG_runerror(L, "string length overflow");
662+ }
661663 tl += l;
662664 }
663665 if (tl <= LUAI_MAXSHORTLEN) { /* is result a short string? */
@@ -672,7 +674,7 @@
672674 setsvalue2s(L, top - n, ts); /* create result */
673675 }
674676 total -= n-1; /* got 'n' strings to create 1 new */
675- L->top -= n-1; /* popped 'n' strings and pushed one */
677+ L->top = top - (n - 1); /* popped 'n' strings and pushed one */
676678 } while (total > 1); /* repeat until only 1 result left */
677679 }
678680
Show on old repository browser