Changeset 6072 in orxonox.OLD

Timestamp:

Dec 12, 2005, 6:58:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind sweep

File:

• trunk/src/lib/graphics/importer/static_model.cc (modified) (3 diffs)

trunk/src/lib/graphics/importer/static_model.cc

@@ -86 +86 @@
 {
   PRINTF(4)("Adding new Group\n");
-  this->name = "";
+  this->name = NULL;
   this->faceMode = -1;
   this->faceCount = 0;
   this->next = NULL;
   this->listNumber = 0;
+  this->indices = NULL;
 
   this->firstFace = new ModelFace;
@@ -109 +110 @@
     glDeleteLists(this->listNumber, 1);
 
-  if (this->name[0] != '\0')
+  if (this->name != NULL)
     delete[] this->name;
 
@@ -277 +278 @@
 void StaticModel::draw (char* groupName) const
 {
+  if (groupName == NULL)
+     return;
   PRINTF(4)("drawing the requested 3D-Models if found.\n");
   ModelGroup* tmpGroup = this->firstGroup;
   while (tmpGroup != NULL)
     {
-      if (!strcmp(tmpGroup->name, groupName))
+      if (tmpGroup->name != NULL && !strcmp(tmpGroup->name, groupName))
         {
           PRINTF(4)("Drawing model %s\n", tmpGroup->name);