Bugfix: Another OPL parser bug

joto · joto · commit 66c5efe2f27e · 2021-04-22T18:05:18.000+02:00
See #330
diff --git a/include/osmium/io/detail/o5m_input_format.hpp b/include/osmium/io/detail/o5m_input_format.hpp
@@ -294,11 +294,11 @@ namespace osmium {
                         return {0, ""};
                     }
 
-                    while (*data++) {
+                    do {
                         if (data == end) {
                             throw o5m_error{"no null byte in user name"};
                         }
-                    }
+                    } while (*data++);
 
                     if (update_pointer) {
                         m_reference_table.add(start, data - start);

Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,11 @@ namespace osmium {`
`294`	`294`	`return {0, ""};`
`295`	`295`	`}`
`296`	`296`
`297`		`- while (*data++) {`
	`297`	`+ do {`
`298`	`298`	`if (data == end) {`
`299`	`299`	`throw o5m_error{"no null byte in user name"};`
`300`	`300`	`}`
`301`		`- }`
	`301`	`+ } while (*data++);`
`302`	`302`
`303`	`303`	`if (update_pointer) {`
`304`	`304`	`m_reference_table.add(start, data - start);`