Changeset 3119 in orxonox.OLD for orxonox

Timestamp:

Dec 6, 2004, 11:43:15 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/images: seg-fault shouldn't occure anymore from strings

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (1 diff)
• object.cc (modified) (5 diffs)

orxonox/branches/images/importer/material.cc

@@ -168 +168 @@
   if (verbose >= 3)
     printf("setting Material Name to %s.\n", mtlName);
-  name = new char [strlen(mtlName)];
+  name = new char [strlen(mtlName)+1];
   strcpy(name, mtlName);
   //  printf ("adding new Material: %s, %p\n", this->getName(), this);

orxonox/branches/images/importer/object.cc

@@ -359 +359 @@
   objFileName = new char[strlen(name)+1];
   strcpy (objFileName, name);
-  objFileName[strlen(name)] = '\0';
   this->readFromObjFile ();
   return true;
@@ -370 +369 @@
 bool Object::readFromObjFile (void)
 {
-  char* fileName = new char [strlen(objPath)+strlen(objFileName)+2];
+  char* fileName = new char [strlen(objPath)+strlen(objFileName)+1];
   fileName[0]='\0';
   if (objFileName != NULL && !strcmp(objFileName, ""))
@@ -376 +375 @@
   strcat(fileName, objPath);
   strcat(fileName, objFileName);
-  printf ("%s. %d\n", fileName, strlen(fileName));
 
   ifstream* OBJ_FILE = new ifstream(fileName);
@@ -457 +455 @@
   if (strcmp(currentGroup->name, "default"))
     {
-      currentGroup->name = new char [strlen(groupString)];
+      currentGroup->name = new char [strlen(groupString)+1];
       strcpy(currentGroup->name, groupString);
     }
@@ -700 +698 @@
   initFace (currentGroup->currentFace);
   
-  currentGroup->currentFace->materialString = new char[strlen(matString)];
+  currentGroup->currentFace->materialString = new char[strlen(matString)+1];
   strcpy (currentGroup->currentFace->materialString, matString);