Changeset 5227 in orxonox.OLD

Timestamp:

Sep 23, 2005, 11:24:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: LoadParam had some major memory-leak… fixed them

Location:

trunk/src

Files:

• lib/shell/shell.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (4 diffs)

trunk/src/lib/shell/shell.cc

@@ -82 +82 @@
 {
   // delete the displayable Buffers
-  for (int i = 0; i < this->bufferDisplaySize; i++)
+  for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
     delete this->bufferText[i];
   delete[] this->bufferText;
@@ -106 +106 @@
 
   ShellBuffer::getInstance()->getBufferIterator()->lastElement();
-  for (int i = 0; i < this->bufferDisplaySize; i++)
+  for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
     this->bufferText[i]->setText(ShellBuffer::getInstance()->getBufferIterator()->prevElement(), true);
 }

trunk/src/orxonox.cc

@@ -177 +177 @@
 
   // initialize everything
-  SDL_InitSubSystem (SDL_INIT_TIMER);
+  SDL_Init(SDL_INIT_TIMER);
   if( initResources () == -1) return -1;
   if( initVideo() == -1) return -1;

trunk/src/util/loading/load_param.cc

@@ -77 +77 @@
         strcpy(this->paramDesc->types[i], tmpTypeName);
 
+        //! @todo SWITCH CASE WITH l_[TYPE]_TYPE -> much faster
           // default value description
         if (!strcmp(tmpTypeName, l_INT_NAME))
@@ -249 +250 @@
     }
   delete iterator;
+  delete this->paramList;
 
   delete[] this->className;
@@ -311 +313 @@
         {
           delete iterator;
-          return enumParamDesc;
+          //return enumParamDesc;
+          return NULL;
         }
       enumParamDesc = iterator->nextElement();
@@ -317 +320 @@
   delete iterator;
 
-  this->paramList->add(new LoadParamDescription(paramName));
-  return paramList->lastElement();
+  LoadParamDescription* newParam = new LoadParamDescription(paramName);
+
+  this->paramList->add(newParam);
+  return newParam;
 }