Changeset 5210 in orxonox.OLD for trunk

Timestamp:

Sep 21, 2005, 12:01:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: other minor valgrid found error-fixes

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• lib/event/event_handler.h (modified) (1 diff)
• lib/shell/shell_buffer.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -175 +175 @@
   {
     /* fist compute all the convex hull face/facelets and centroids */
-    for(int i = 0; i < length; i+=3)          /* FIX-ME-QUICK: hops of 3, array indiscontinuity*/
+    for(int i = 0; i+3 < length ; i+=3)          /* FIX-ME-QUICK: hops of 3, array indiscontinuity*/
     {
       p = verticesList[i];

trunk/src/lib/event/event_handler.cc

@@ -36 +36 @@
   this->setClassID(CL_EVENT_HANDLER, "EventHandler");
 
-  this->listeners = new EventListener**[ES_NUMBER];
-  for(int i = 0; i < ES_NUMBER; ++i)
-    this->listeners[i] = new EventListener*[EV_NUMBER];
-
   /* now initialize them all to zero */
-  for(int i = 0; i < ES_NUMBER; ++i)
-    {
-      for(int j = 0; j < EV_NUMBER; ++j)
+  for(int i = 0; i < ES_NUMBER; i++)
+    {
+      for(int j = 0; j < EV_NUMBER; j++)
         {
           this->listeners[i][j] = NULL;

trunk/src/lib/event/event_handler.h

@@ -45 +45 @@
 
  private:
-  static EventHandler*       singletonRef;                  //!< the singleton reference
+  static EventHandler*       singletonRef;                    //!< the singleton reference
 
-  EventListener***           listeners;                     //!< a list of registered listeners
-  elState                    state;                         //!< the state of the event handlder
-  KeyMapper*                 keyMapper;                     //!< reference to the key mapper
+  EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners
+  elState                    state;                           //!< the state of the event handlder
+  KeyMapper*                 keyMapper;                       //!< reference to the key mapper
 };
 

trunk/src/lib/shell/shell_buffer.cc

@@ -94 +94 @@
   while (charElem != NULL)
   {
-    delete charElem;
+    delete[] charElem;
     charElem = bufferIterator->nextElement();
   }
@@ -180 +180 @@
     if (this->buffer->getSize() > this->bufferSize)
     {
-      delete this->buffer->firstElement();
+      delete[] this->buffer->firstElement();
       this->buffer->remove(this->buffer->firstElement());
     }

trunk/src/orxonox.cc

@@ -102 +102 @@
   delete EventHandler::getInstance();
   delete this->iniParser;
-  delete this->configFileName;
+  delete[] this->configFileName;
 
   ClassList::debug();