Changeset 3562 in orxonox.OLD for orxonox/branches/levelloader/src/lib/util/substring.cc

Timestamp:

Mar 15, 2005, 6:01:21 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Managed to get through the whole loading sequence… still not generating a valid world though…

File:

• orxonox/branches/levelloader/src/lib/util/substring.cc (modified) (2 diffs)

orxonox/branches/levelloader/src/lib/util/substring.cc

@@ -34 +34 @@
         strings = new char*[n];
         
+        assert( strings != NULL);
+        
         int i = 0;
         int l = 0;
@@ -41 +43 @@
         while( end != NULL)
         {
+                assert( i < n);
                 l = end - offset;
                 strings[i] = new char[l + 1];
+                assert( strings[i] != NULL);
                 strncpy( strings[i], offset, l);
+                strings[i][l] = 0;
                 i++;
                 end++;
                 offset = end;
-                end = strchr( string, ',');
+                end = strchr( offset, ',');
         }
         
         strings[i] = new char[l + 1];
+        l = strlen( offset);
         strncpy( strings[i], offset, l);
-        l = strlen( offset);
+        strings[i][l] = 0;
 }