Changeset 4111 in orxonox.OLD for orxonox/branches/heightMap/src/lib/graphics/importer/objModel.cc

Timestamp:

May 7, 2005, 5:22:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Trunk/importer back here.
merged with command:
svn merge -r 3918:HEAD ../../trunk/src/lib/graphics/importer/ src/lib/graphics/importer/

this fixed the issue with the segfault. It really was an error in the Model-class
@nico:

1. sorry
2. thanks for pointing this out to me

File:

• orxonox/branches/heightMap/src/lib/graphics/importer/objModel.cc (modified) (1 diff)

orxonox/branches/heightMap/src/lib/graphics/importer/objModel.cc

@@ -196 +196 @@
   this->mtlFileName = new char [strlen(mtlFile)+1];
   strcpy(this->mtlFileName, mtlFile);
-  char* fileName = new char [strlen(objPath) + strlen(this->mtlFileName)+1];
-  strcpy(fileName, this->objPath);
-  strcat(fileName, this->mtlFileName);
+  char* fileName = new char [strlen(this->objPath) + strlen(this->mtlFileName)+1];
+  sprintf(fileName, "%s%s", this->objPath, this->mtlFileName);