Skip to content

[hl/std] Prevent StringBuf expand overflow #12990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuxiaomao wants to merge 2 commits into
base: development
Choose a base branch
from
+10 −1
Open

[hl/std] Prevent StringBuf expand overflow #12990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f4e96
[hl/std] Prevent StringBuf expand overflow
yuxiaomao Jul 16, 2026
b055d33
[tests] Ignore dynset field name ref in hlcode check
yuxiaomao Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion std/hl/_std/StringBuf.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@
}

inline function __expand(need:Int):Void {
var nsize = (size * 3) >> 1;
var nsize = size + (size >> 1);
if (nsize < size)
nsize = 0x7FFF0000;
if (need > nsize)
nsize = need;
if (nsize <= size)
throw "StringBuf maximum capacity reached";
var b2 = new hl.Bytes(nsize);
b2.blit(0, b, 0, pos);
b = b2;
Expand Down
5 changes: 5 additions & 0 deletions tests/hlcode/src/Macro.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ class Macro {
// Remove source line prefix from instruction lines: ".12 @0" → "@0"
trimmed = ~/^\.\d+[ \t]+/.replace(trimmed, "");

// Normalize dynset constant in "dynset 7[@159],0" → "dynset 7[@0],0"
trimmed = ~/\bdynset (\d+)\[@(\d+)\],(\d+)/.map(trimmed, function(r) {
return "dynset " + r.matched(1) + "[@" + getGlobalId("str_" + r.matched(2)) + "]," + r.matched(3);
});

// Normalize global IDs in "global R, G" (OGetGlobal): G is the global index
trimmed = ~/\bglobal (\d+), (\d+)/.map(trimmed, function(r) {
return "global " + r.matched(1) + ", " + getGlobalId(r.matched(2));
Expand Down
Loading