From e5563f887206cd6b39beeaa53c545d7dbae67476 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sat, 15 Feb 2014 17:41:53 +0100
Subject: report stack overflows as errors & fixed ValueStack dtor

 * ValueStack destruction might have resulted in Segfaults at shutdown
---
 src/expressions.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/expressions.h')

diff --git a/src/expressions.h b/src/expressions.h
index 83d3b12..7785215 100644
--- a/src/expressions.h
+++ b/src/expressions.h
@@ -21,6 +21,7 @@
 #include <glib.h>
 
 #include "undo.h"
+#include "parser.h" // State::Error
 
 template <typename Type>
 class ValueStack {
@@ -71,7 +72,7 @@ public:
 
 	~ValueStack()
 	{
-		delete stack;
+		delete[] stack;
 	}
 
 	inline int
@@ -83,6 +84,9 @@ public:
 	inline Type &
 	push(Type value, int index = 1)
 	{
+		if (items() == size)
+			throw State::Error("Stack overflow");
+
 		for (int i = -index + 1; i; i++)
 			top[i+1] = top[i];
 
-- 
cgit v1.2.3