Browse Source

fixing error if lab file contains no trailing newline

tempestpy_adaptions
gereon 12 years ago
parent
commit
c436586303
  1. 6
      src/parser/readLabFile.cpp

6
src/parser/readLabFile.cpp

@ -63,7 +63,7 @@ LabParser::LabParser(uint_fast64_t node_count, const char * filename)
{ {
size_t cnt = 0; size_t cnt = 0;
/* /*
* iterate over tokens while not at end of file
* iterate over tokens until we hit #END or end of file
*/ */
while(buf[0] != '\0') while(buf[0] != '\0')
{ {
@ -81,7 +81,7 @@ LabParser::LabParser(uint_fast64_t node_count, const char * filename)
foundDecl = true; foundDecl = true;
continue; continue;
} }
if (strncmp(buf, "#END", cnt) == 0)
else if (strncmp(buf, "#END", cnt) == 0)
{ {
foundEnd = true; foundEnd = true;
break; break;
@ -171,7 +171,7 @@ LabParser::LabParser(uint_fast64_t node_count, const char * filename)
* parse node number, then iterate over propositions * parse node number, then iterate over propositions
*/ */
node = checked_strtol(buf, &buf); node = checked_strtol(buf, &buf);
while (buf[0] != '\n')
while ((buf[0] != '\n') && (buf[0] != '\0'))
{ {
cnt = strcspn(buf, separator); cnt = strcspn(buf, separator);
if (cnt == 0) if (cnt == 0)

Loading…
Cancel
Save