Merge pull request #4799 from aG0aep6G/14717

fix issue 14717 - Ddoc macro recursion limit too low
dlang · Jul 5, 2015 · ef51538 · ef51538
2 parents 64c473c + da73aae
commit ef51538
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/macro.c b/src/macro.c
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include "errors.h"
 #include "rmem.h"
 #include "root.h"
 
@@ -232,9 +233,15 @@ void Macro::expand(OutBuffer *buf, size_t start, size_t *pend,
     printf("Buf is: '%.*s'\n", *pend - start, buf->data + start);
 #endif
 
+    // limit recursive expansion
     static int nest;
-    if (nest > 100)             // limit recursive expansion
+    static const int nestLimit = 1000;
+    if (nest > nestLimit)
+    {
+        error(Loc(), "DDoc macro expansion limit exceeded; more than %d "
+            "expansions.", nestLimit);
         return;
+    }
     nest++;
 
     size_t end = *pend;

diff --git a/src/magicport.json b/src/magicport.json
@@ -1948,6 +1948,8 @@
                 "core.stdc.ctype",
                 "core.stdc.string",
                 "doc",
+                "errors",
+                "globals",
                 "root.outbuffer",
                 "root.rmem",
                 "utf"