From a0145fffef9a8f220b8fd852d8f78656386881f3 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Mon, 3 Nov 2014 15:29:06 +0000
Subject: fixed node purging

git-svn-id: file:///var/local/svn/basicwriter@96 daaaf23c-2e50-4459-9457-1e69db5a47bf
---
 src/core/dom/Node.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/core/dom')

diff --git a/src/core/dom/Node.cpp b/src/core/dom/Node.cpp
index dcf4261..8df0787 100644
--- a/src/core/dom/Node.cpp
+++ b/src/core/dom/Node.cpp
@@ -257,13 +257,21 @@ void NodeManager::purgeDeleted()
 {
 	// Perform the actual deletion if the recursion level is zero
 	if (deletionRecursionDepth == 0 && !deleted.empty()) {
+		// Increment the recursion depth so this function does not get called
+		// again while deleting nodes
 		ScopedIncrement incr{deletionRecursionDepth};
-		for (Node *n : deleted) {
+
+		// Deleting nodes might add new nodes to the deleted list, thus the
+		// iterator would get invalid and we have to use this awkward
+		// construction
+		while (!deleted.empty()) {
+			auto it = deleted.begin();
+			Node *n = *it;
+			deleted.erase(it);
 			marked.erase(n);
 			nodes.erase(n);
 			delete n;
 		}
-		deleted.clear();
 	}
 }
 
-- 
cgit v1.2.3