Changeset 5211 in orxonox.OLD for trunk/src/util

Timestamp:

Sep 21, 2005, 2:21:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind mem-leak-recovered

Location:

trunk/src/util

Files:

• loading/load_param.cc (modified) (2 diffs)
• resource_manager.cc (modified) (4 diffs)

trunk/src/util/loading/load_param.cc

@@ -133 +133 @@
   this->types = NULL;
   this->description = NULL;
+  this->defaultValues = NULL;
   this->paramName = new char[strlen(paramName)+1];
   strcpy(this->paramName, paramName);
-  this->defaultValues = NULL;
 }
 
@@ -158 +158 @@
   }
 
-  delete []this->types;
-  delete []this->defaultValues;
-  delete []this->paramName;
-  delete []this->description;
+  delete[] this->types;
+  delete[] this->defaultValues;
+  delete[] this->paramName;
+  delete[] this->description;
 }
 

trunk/src/util/resource_manager.cc

@@ -81 +81 @@
     }
   delete tmpIt;
-
   delete this->imageDirs;
+
+  delete[] this->dataDir;
 
   ResourceManager::singletonRef = NULL;
@@ -356 +357 @@
                       PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
                       tmpResource->pointer = new Texture(imgName);
-                      delete []imgName;
+                      delete[] imgName;
                       break;
                     }
-                  delete []imgName;
+                  delete[] imgName;
                   tmpDir = iterator->nextElement();
                 }
@@ -375 +376 @@
       if (tmpResource->pointer)
         this->resourceList->add(tmpResource);
-      delete []fullName;
+      delete[] fullName;
     }
   if (tmpResource->pointer)
@@ -631 +632 @@
     }
   else
+  {
+    delete[] tmpDirName;
     return false;
+  }
 }