Fix for errors in streams '{\**\\**\"a":"b"}' and '{ ' with comments #46
Conversation
…tyle comments enabled.
| state->line_no++; | ||
| state->line_offset = state->offset; | ||
| } else if ((' ' != c) && ('\r' != c) && ('\t' != c)) { | ||
| return 0; | ||
| } else if (c != ' ' && c != '\r' && c != '\t') { |
There was a problem hiding this comment.
This line isn't actually changing anything (but my coding style).
| for (; state->offset < state->size; state->offset++) { | ||
| const char c = state->src[state->offset]; | ||
|
|
||
| if ('\n' == c) { | ||
| if (c == '\n') { |
There was a problem hiding this comment.
This line isn't a functional change.
|
The functional changes are on the other lines. Those are just simple changes that I made while debugging the issue to make the function easier to understand for myself - feel free to ditch them. The important changes are - functions return 1 if some comments or whitespace have been consumed, and the main function will keep on going until both functions say that they have nothing more to consume, or the stream ends. Oh, and I see clang lives up to its name. Change the return type to size_t to make it happy. |
|
One more thing - you also need a stream end check when you read the second byte in json_skip_c_style_comments - otherwise you will again read past the input buffer on '{/' |
|
I've brought this functionality in as part of #49 |
Hi,
Those are fixes for bugs mostly caused by the design issue I told you about. I added a test case that tests for multiple comment - whitespace sequences.
You should consider adding some tests that are done at the end of mmap'ed or VirtualAlloc'ed page - this way your code will segfault if it reads past the input buffer like it would on '{ '.
Fireice