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

Timestamp:

Aug 22, 2005, 3:20:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: orxonox starts up in Windows again, but thats all.
Somewhere in the process it gets a sigsegv

File:

• trunk/src/util/resource_manager.cc (modified) (3 diffs)

trunk/src/util/resource_manager.cc

@@ -99 +99 @@
       this->dataDir = new char[strlen(realDir)+1];
       strcpy(this->dataDir, realDir);
-      delete realDir;
+      delete[] realDir;
       return true;
     }
   else
     {
-      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
-      delete realDir;
+      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", realDir, this->dataDir);
+      delete[] realDir;
       return false;
     }
@@ -631 +631 @@
 
   // checking for the termination of the string given. If there is a "/" at the end cut it away
-  if (directoryName[strlen(directoryName)-1] == '/')
+  if (directoryName[strlen(directoryName)-1] == '/' ||
+      directoryName[strlen(directoryName)-1] == '\\')
     {
       tmpDirName = new char[strlen(directoryName)+1];
@@ -651 +652 @@
                             ))
         {
-          delete tmpDirName;
+          delete[] tmpDirName;
           return true;
         }