diff options
author | Matthew Olsson <matthewcolsson@gmail.com> | 2020-06-10 21:40:27 -0700 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-06-13 12:43:22 +0200 |
commit | e8e728454c5d436a02eaa1d24bc3afe357090c52 (patch) | |
tree | ac40614d78823eaba887e5657132681761c2b7cc /DevTools/Inspector | |
parent | 39576b22385a2e6b6fc4fbf5e90e6b72157e9ee2 (diff) | |
download | serenity-e8e728454c5d436a02eaa1d24bc3afe357090c52.zip |
AK: JsonParser improvements
- Parsing invalid JSON no longer asserts
Instead of asserting when coming across malformed JSON,
JsonParser::parse now returns an Optional<JsonValue>.
- Disallow trailing commas in JSON objects and arrays
- No longer parse 'undefined', as that is a purely JS thing
- No longer allow non-whitespace after anything consumed by the initial
parse() call. Examples of things that were valid and no longer are:
- undefineddfz
- {"foo": 1}abcd
- [1,2,3]4
- JsonObject.for_each_member now iterates in original insertion order
Diffstat (limited to 'DevTools/Inspector')
-rw-r--r-- | DevTools/Inspector/RemoteProcess.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/DevTools/Inspector/RemoteProcess.cpp b/DevTools/Inspector/RemoteProcess.cpp index d1ceb61c3d..6e8dce5894 100644 --- a/DevTools/Inspector/RemoteProcess.cpp +++ b/DevTools/Inspector/RemoteProcess.cpp @@ -167,11 +167,12 @@ void RemoteProcess::update() dbg() << "Got data size " << length << " and read that many bytes"; auto json_value = JsonValue::from_string(data); - ASSERT(json_value.is_object()); + ASSERT(json_value.has_value()); + ASSERT(json_value.value().is_object()); - dbg() << "Got JSON response " << json_value.to_string(); + dbg() << "Got JSON response " << json_value.value().to_string(); - auto& response = json_value.as_object(); + auto& response = json_value.value().as_object(); auto response_type = response.get("type").as_string_or({}); if (response_type.is_null()) |