From 014fd97fef293c3f8d5f6397401676b4c439813b Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 28 Mar 2024 10:07:12 +0100
Subject: [PATCH] cppparser: Fix string handling in expansion of macro
 arguments

See #1638
---
 dtool/src/cppparser/cppPreprocessor.cxx | 43 ++++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx
index bd8934427c..c6491b3698 100644
--- a/dtool/src/cppparser/cppPreprocessor.cxx
+++ b/dtool/src/cppparser/cppPreprocessor.cxx
@@ -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++;