Safer buffer index check in LineReader::next_line

mhfrantz-mse · mhfrantz-mse · commit 352c366b9720 · 2021-07-16T21:46:26.000Z
Valgrind identified these.
Need to validate the buffer index before using it.
diff --git a/csv.h b/csv.h
@@ -465,7 +465,7 @@ namespace io{
                         }
 
                         int line_end = data_begin;
-                        while(buffer[line_end] != '\n' && line_end != data_end){
+                        while(line_end != data_end && buffer[line_end] != '\n'){
                                 ++line_end;
                         }
 
@@ -476,7 +476,7 @@ namespace io{
                                 throw err;
                         }
 
-                        if(buffer[line_end] == '\n' && line_end != data_end){
+                        if(line_end != data_end && buffer[line_end] == '\n'){
                                 buffer[line_end] = '\0';
                         }else{
                                 // some files are missing the newline at the end of the

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ namespace io{`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`int line_end = data_begin;`
`468`		`- while(buffer[line_end] != '\n' && line_end != data_end){`
	`468`	`+ while(line_end != data_end && buffer[line_end] != '\n'){`
`469`	`469`	`++line_end;`
`470`	`470`	`}`
`471`	`471`
`@@ -476,7 +476,7 @@ namespace io{`
`476`	`476`	`throw err;`
`477`	`477`	`}`
`478`	`478`
`479`		`- if(buffer[line_end] == '\n' && line_end != data_end){`
	`479`	`+ if(line_end != data_end && buffer[line_end] == '\n'){`
`480`	`480`	`buffer[line_end] = '\0';`
`481`	`481`	`}else{`
`482`	`482`	`// some files are missing the newline at the end of the`