FIXED potential access to iterators that point to the end of a list

ksterker · Aug 4, 2010 · 05072ed · 05072ed
1 parent ed41a92
commit 05072ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/dlgedit/dlg_module.cc b/src/dlgedit/dlg_module.cc
@@ -224,6 +224,9 @@ void DlgModule::deleteNode (DlgNode *node)
     // if the node is a circle, also delete the attached arrows
     if (node->type () != LINK)
     {
+        // reset traversal info if current node gets deleted
+        traverse_.clear();
+
         // delete all preceding arrows
         for (DlgNode *i = node->prev (FIRST); i != NULL; i = node->prev (FIRST))
         {

diff --git a/src/dlgedit/dlg_node.cc b/src/dlgedit/dlg_node.cc
@@ -83,7 +83,7 @@ DlgNode* DlgNode::getNode (std::list<DlgNode*>::iterator &it,
     }
 
     // forward iteration
-    if (offset > 0)
+    if (offset >= 0)
     {
         for (int i = 0; i < offset && it != lst.end (); i++, it++);
         if (it != lst.end ()) return *it;

diff --git a/src/dlgedit/gui_graph.cc b/src/dlgedit/gui_graph.cc
@@ -201,7 +201,7 @@ bool GuiGraph::newArrow (DlgPoint &point)
         if (end == NULL) return false;
     }
 
-    // no loops and no bidirectional connections
+    // no loops and no duplicate connections
     if (start == end || ((DlgCircle *) start)->hasChild (end)) return false; 
 
     // no connection between start and end if both are PLAYER nodes