Changeset 3db67e for molecuilder/src

Timestamp:

Feb 25, 2010, 4:56:16 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

33bc66

Parents:

8d9d38

Message:

FIX: repaired some access violation of STL-iterators in Observer and ActionRegistry

Location:

molecuilder/src

Files:

• Actions/ActionRegistry.cpp (modified) (1 diff)
• Patterns/Observer.cpp (modified) (4 diffs)

molecuilder/src/Actions/ActionRegistry.cpp

@@ -24 +24 @@
 {
   map<const string,Action*>::iterator iter;
-  for(iter=actionMap.begin();iter!=actionMap.end();iter++) {
+  for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
     delete iter->second;
-    actionMap.erase(iter);
   }
+  actionMap.clear();
 }
 

molecuilder/src/Patterns/Observer.cpp

@@ -79 +79 @@
     callees_t *callees = callTable[this];
     callees_t::iterator iter;
-    for(iter=callees->begin();iter!=callees->end();iter++){
+    for(iter=callees->begin();iter!=callees->end();++iter){
       (*iter).second->update(this);
     }
@@ -123 +123 @@
 
   callees_t::iterator iter;
-  for(iter=callees->begin();iter!=callees->end();iter++){
+  for(iter=callees->begin();iter!=callees->end();++iter){
     res |= ((*iter).second == target);
   }
@@ -134 +134 @@
   callees_t *callees = callTable[this];
   callees_t::iterator iter;
-  for(iter=callees->begin();iter!=callees->end();iter++) {
-    if((*iter).second == target)
-      callees->erase(iter);
+  for(iter=callees->begin();iter!=callees->end();) {
+    if((*iter).second == target) {
+      callees->erase(iter++);
+    }
+    else {
+      ++iter;
+    }
   }
   if(callees->empty()){
@@ -158 +162 @@
     callees_t *callees = callTable[this];
     callees_t::iterator iter;
-    for(iter=callees->begin();iter!=callees->end();iter++){
+    for(iter=callees->begin();iter!=callees->end();++iter){
       (*iter).second->subjectKilled(this);
     }