TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 15:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

cppparser: Fix string handling in expansion of macro arguments

Browse Source 
See #1638
This commit is contained in:
rdb 2024-03-28 10:07:12 +01:00
parent e63ba11af2
commit 014fd97fef
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dtool/src/cppparser/cppPreprocessor.cxx
View File

@ -2546,26 +2546,39 @@ extract_manifest_args_inline(const string &name, int num_args,
} else {
// Skip paren.
p++;
// Skip whitespace after paren.
while (p < expr.size() && isspace(expr[p])) {
p++;
}
int paren_level = 1;
size_t q = p;
while (p < expr.size() && expr[p] != ')') {
if (expr[p] == ',') {
while (p < expr.size()) {
if (expr[p] == ',' && paren_level == 1) {
args.push_back(trim_blanks(expr.substr(q, p - q)));
q = p+1;
} else if (expr[p] == '(') {
// Nested parens.
int paren_level = 1;
while (p+1 < expr.size() && paren_level > 0) {
p++;
if (expr[p] == '(') {
paren_level++;
} else if (expr[p] == ')') {
paren_level--;
} else if (expr[p] == '"' || expr[p] == '\'') {
// Quoted string or character.
int quote_mark = expr[p];
p++;
while (p < expr.size() && expr[p] != quote_mark && expr[p] != '\n') {
if (expr[p] == '\\') {
p++;
}
if (p < expr.size()) {
p++;
}
}
} else if (expr[p] == '(') {
++paren_level;
} else if (expr[p] == ')') {
--paren_level;
if (paren_level == 0) {
break;
}
} else if (isspace(expr[p])) {
// Skip whitespace at the beginning.
if (q == p) {
q++;
}
}
p++;