Fix expr iterator mutation bug

reuk · reuk · commit 82d42e57fcd5 · 2017-11-24T18:09:23.000Z
diff --git a/src/util/expr_iterator.h b/src/util/expr_iterator.h
@@ -102,8 +102,12 @@ class depth_iterator_baset
   depth_iterator_t &next_sibling_or_parent()
   {
     PRECONDITION(!m_stack.empty());
-    m_stack.back().it=m_stack.back().end;
-    ++(*this);
+    m_stack.pop_back();
+    if(!m_stack.empty())
+    {
+      ++m_stack.back().it;
+      return ++(*this);
+    }
     return this->downcast();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,12 @@ class depth_iterator_baset`
`102`	`102`	`depth_iterator_t &next_sibling_or_parent()`
`103`	`103`	`{`
`104`	`104`	`PRECONDITION(!m_stack.empty());`
`105`		`- m_stack.back().it=m_stack.back().end;`
`106`		`- ++(*this);`
	`105`	`+ m_stack.pop_back();`
	`106`	`+ if(!m_stack.empty())`
	`107`	`+ {`
	`108`	`+ ++m_stack.back().it;`
	`109`	`+ return ++(*this);`
	`110`	`+ }`
`107`	`111`	`return this->downcast();`
`108`	`112`	`}`
`109`	`113`