Fix JSON parsing of escaped strings #7545
Conversation
There was a problem hiding this comment.
Nice, this looks simpler than my solution from https://github.com/WebAssembly/binaryen/pull/7486/files#diff-88a72bcb9f2621a8ab37e23773a8209463146494d55a988255efff2fa35cf8b6R276-R290
src/support/json.h
Outdated
| if (*close == '\\') { | ||
| // Skip the \ and the character after it, which it escapes. | ||
| close++; | ||
| assert(*close); |
There was a problem hiding this comment.
Not sure how useful this assertion is.
There was a problem hiding this comment.
It is necessary, because if this is 0, then it is not valid to do the next close++ and then read *close, which would be past the string.
There was a problem hiding this comment.
Oh, I see, it's checking for the end of a C-style string. Can we add a && "unexpected end of string" to clarify?
There was a problem hiding this comment.
I see this file was switched to throwing from asserts meanwhile, as I merged in main. I updated the errors to have text like that.
| close++; | ||
| assert(*close); | ||
| } | ||
| close++; |
There was a problem hiding this comment.
These are just pointers, and the current code is consistent with usage elsewhere in the file - is it worth adding an inconsistency here do you think?
To find the end of a string, we must be more careful of escaping - we assumed
any
\"was an escaped double-quote, but it might be part of\\", that is, wherethere is an escaped
\before us, and the double-quote is not escaped itself.This fixes StringLifting on real-world Java code I am testing on.