* Override YYMALLOC and YYFREE so that we can call AT[un]protectMemory

  on the Bison parse stack.  Otherwise, a garbage collect during
  parsing could lead to a crash.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index fe87734f20..ec07a01919 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -43,6 +43,26 @@ static Pos makeCurPos(YYLTYPE * loc, void * data)
 }
 
 #define CUR_POS makeCurPos(yylocp, data)
+
+
+/* Make sure that the parse stack is scanned by the ATerm garbage
+   collector. */
+static void * mallocAndProtect(size_t size)
+{
+    void * p = malloc(size);
+    if (p) ATprotectMemory(p, size);
+    return p;
+}
+
+static void freeAndUnprotect(void * p)
+{
+    ATunprotectMemory(p);
+    free(p);
+}
+
+#define YYMALLOC mallocAndProtect
+#define YYFREE freeAndUnprotect
+
  
 %}