remove memory corruption bug from cparse.d

dlang · Jul 4, 2022 · a33e88c · a33e88c
1 parent 8d433e7
commit a33e88c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/src/dmd/cparse.d b/src/dmd/cparse.d
@@ -4986,7 +4986,8 @@ final class CParser(AST) : Parser!AST
                 return true;
             }
         }
-        error("C preprocessor directive `#%s` is not supported", n.toChars());
+        if (n.ident != Id.undef)
+            error("C preprocessor directive `#%s` is not supported", n.toChars());
         return false;
     }
 
@@ -5226,13 +5227,35 @@ final class CParser(AST) : Parser!AST
     {
         if (!defines || defines.length < 10)  // minimum length of a #define line
             return;
-        const length = defines.length;
-        defines.writeByte(0);
-        auto slice = defines.peekChars()[0 .. length];
+        OutBuffer* buf = defines;
+        defines = null;                 // prevent skipToNextLine() and parseSpecialTokenSequence()
+                                        // from appending to slice[]
+        const length = buf.length;
+        buf.writeByte(0);
+        auto slice = buf.peekChars()[0 .. length];
         resetDefineLines(slice);                // reset lexer
 
         const(char)* endp = &slice[length - 7];
 
+        size_t[void*] defineTab;    // hash table of #define's turned into Symbol's
+                                    // indexed by Identifier, returns index into symbols[]
+                                    // The memory for this is leaked
+
+        void addVar(AST.VarDeclaration v)
+        {
+            /* If it's already defined, replace the earlier
+             * definition
+             */
+            if (size_t* pd = cast(void*)v.ident in defineTab)
+            {
+                //printf("replacing %s\n", v.toChars());
+                (*symbols)[*pd] = v;
+                return;
+            }
+            defineTab[cast(void*)v.ident] = symbols.length;
+            symbols.push(v);
+        }
+
         Token n;
 
         while (p < endp)
@@ -5271,7 +5294,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.IntegerExp(scanloc, intvalue, t);
                                 auto v = new AST.VarDeclaration(scanloc, t, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                symbols.push(v);
+                                addVar(v);
                                 nextDefineLine();
                                 continue;
                             }
@@ -5294,7 +5317,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.RealExp(scanloc, floatvalue, t);
                                 auto v = new AST.VarDeclaration(scanloc, t, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                symbols.push(v);
+                                addVar(v);
                                 nextDefineLine();
                                 continue;
                             }
@@ -5312,7 +5335,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.StringExp(scanloc, str[0 .. len], len, 1, postfix);
                                 auto v = new AST.VarDeclaration(scanloc, null, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                symbols.push(v);
+                                addVar(v);
                                 nextDefineLine();
                                 continue;
                             }
@@ -5334,6 +5357,8 @@ final class CParser(AST) : Parser!AST
             }
             nextDefineLine();
         }
+
+        defines = buf;
     }
 
     //}

diff --git a/test/compilable/extra-files/testcdefines.i.cg b/test/compilable/extra-files/testcdefines.i.cg
@@ -0,0 +1,2 @@
+=== compilable/testcdefines.i.cg
+extern (C) enum int _ATFILE_SOURCE = 1;
diff --git a/test/compilable/testcdefines.i b/test/compilable/testcdefines.i
@@ -0,0 +1,5 @@
+// REQUIRED_ARGS: -vcg-ast -o-
+// OUTPUT_FILES: compilable/testcdefines.i.cg
+// TEST_OUTPUT_FILE: extra-files/testcdefines.i.cg
+#undef _ATFILE_SOURCE
+#define _ATFILE_SOURCE 1