Changeset 5953 in orxonox.OLD for trunk/src/lib/parser/ini_parser/ini_parser.cc

Timestamp:

Dec 7, 2005, 1:58:39 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ini_parser safer now

File:

• trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) (4 diffs)

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -125 +125 @@
   FILE*    stream;           //< The stream we use to read the file.
   int      lineCount = 0;    //< The Count of lines.
-
 
   if (this->fileName != NULL)
@@ -448 +447 @@
   {
     std::list<IniEntry>::const_iterator entry = this->getEntryIT(entryName, sectionName);
-    if (!strcmp((*entry).name, entryName))
+    if (entry != NULL &&  !strcmp((*entry).name, entryName))
       return (*entry).value;
     PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName, sectionName);
@@ -618 +617 @@
       if (!strcmp((*entry).name, entryName))
         break;
-  return entry;
+  if (entry == (*section).entries.end())
+    return NULL;
+  else
+    return entry;
 }
 
@@ -638 +640 @@
       if (!strcmp((*entry).name, entryName))
         break;
-  return entry;
+  if (entry == (*section).entries.end())
+    return NULL;
+  else
+    return entry;
 }