mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 03:57:44 +00:00
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
This commit is contained in:
parent
39576b2238
commit
e8e728454c
29 changed files with 189 additions and 118 deletions
|
@ -105,13 +105,13 @@ public:
|
|||
auto request = m_socket->read(length);
|
||||
|
||||
auto request_json = JsonValue::from_string(request);
|
||||
if (!request_json.is_object()) {
|
||||
if (!request_json.has_value() || !request_json.value().is_object()) {
|
||||
dbg() << "RPC client sent invalid request";
|
||||
shutdown();
|
||||
return;
|
||||
}
|
||||
|
||||
handle_request(request_json.as_object());
|
||||
handle_request(request_json.value().as_object());
|
||||
};
|
||||
}
|
||||
virtual ~RPCClient() override
|
||||
|
|
|
@ -48,7 +48,8 @@ HashMap<pid_t, Core::ProcessStatistics> ProcessStatisticsReader::get_all()
|
|||
|
||||
auto file_contents = file->read_all();
|
||||
auto json = JsonValue::from_string(file_contents);
|
||||
json.as_array().for_each([&](auto& value) {
|
||||
ASSERT(json.has_value());
|
||||
json.value().as_array().for_each([&](auto& value) {
|
||||
const JsonObject& process_object = value.as_object();
|
||||
Core::ProcessStatistics process;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue