gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-05-09 11:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow invalid interpolations to occur (#1925)

Browse Source 
Fixes #1921
This commit is contained in:
Rangi
2026-04-11 12:16:07 -04:00
committed by GitHub
parent 123201ecc6
commit df0b557638
9 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asm/lexer.cpp
+10 -3
View File
@@ -1320,6 +1320,7 @@ static std::pair<Symbol const *, std::shared_ptr<std::string>> readInterpolation
std::string identifier;
FormatSpec fmt{};
bool invalid = false;
for (;;) {
// Use `consumeChar()` since `peek()` might expand nested interpolations and recursively
@@ -1330,7 +1331,8 @@ static std::pair<Symbol const *, std::shared_ptr<std::string>> readInterpolation
}
continue; // Restart, reading from the new buffer
} else if (int c = peek(); c == EOF || isNewline(c) || c == '"') {
error("Missing '}'");
error("Unterminated interpolation");
invalid = true;
break;
} else if (c == '}') {
shiftChar();
@@ -1339,15 +1341,20 @@ static std::pair<Symbol const *, std::shared_ptr<std::string>> readInterpolation
shiftChar();
size_t n = fmt.parseSpec(identifier.c_str());
if (!fmt.isValid() || n != identifier.length()) {
error("Invalid format spec \"%s\"", identifier.c_str());
error("Invalid interpolation format spec \"%s\"", identifier.c_str());
invalid = true;
}
identifier.clear(); // Now that format has been set, restart at beginning of string
identifier.clear(); // Now that format has been set, restart at beginning of string.
} else {
shiftChar();
identifier += c;
}
}
if (invalid) {
return {nullptr, nullptr}; // Don't allow invalid interpolation to occur.
}
if (identifier.starts_with('#')) {
// Skip a '#' raw symbol prefix, but after expanding any nested interpolations.
identifier.erase(0, 1);