Changeset 9253 for code/trunk

Timestamp:

May 28, 2012, 12:13:00 AM (13 years ago)

Author:

landauf

Message:

fixed crash in NotificationQueue - iterators are not guaranteed to be accessible after erasing them from the set

File:

• code/trunk/src/modules/notifications/NotificationQueue.cc (modified) (7 diffs)

code/trunk/src/modules/notifications/NotificationQueue.cc

@@ -45 +45 @@
 
     CreateFactory(NotificationQueue);
-    
+
     /**
     @brief
@@ -62 +62 @@
 
         this->creationTime_ = std::time(0);
-        
+
         this->registerVariables();
     }
@@ -111 +111 @@
         if(this->isRegistered())
             this->clear();
-            
+
         this->create();
 
@@ -171 +171 @@
         XMLPortParam(NotificationQueue, "displayTime", setDisplayTime, getDisplayTime, xmlelement, mode);
     }
-    
-    
+
+
     /**
     @brief
@@ -313 +313 @@
         orxout(verbose_more, context::notifications) << "Notification \"" << (*it)->notification->getMessage() << "\" removed from NotificationQueue '" << this->getName() << "'" << endl;
 
+        delete *containerIterator;
+
         this->ordering_.erase(containerIterator);
         this->notifications_.erase(it);
 
         this->size_--;
-
-        delete *containerIterator;
 
         // TODO: index automatically cast?
@@ -370 +370 @@
             return;
         }
-        
+
         this->maxSize_ = size;
         this->maxSizeChanged();
@@ -400 +400 @@
             orxout(internal_warning, context::notifications) << "Trying to set display time of NotificationQueue '" << this->getName() << "' to non-positive value. Ignoring..." << endl;
         }
-            
+
         this->displayTime_ = time;
         this->displayTimeChanged();