summaryrefslogtreecommitdiff
path: root/Services/DHCPClient
diff options
context:
space:
mode:
authorMatthew Olsson <matthewcolsson@gmail.com>2020-06-10 21:40:27 -0700
committerAndreas Kling <kling@serenityos.org>2020-06-13 12:43:22 +0200
commite8e728454c5d436a02eaa1d24bc3afe357090c52 (patch)
treeac40614d78823eaba887e5657132681761c2b7cc /Services/DHCPClient
parent39576b22385a2e6b6fc4fbf5e90e6b72157e9ee2 (diff)
downloadserenity-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 'Services/DHCPClient')
-rw-r--r--Services/DHCPClient/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Services/DHCPClient/main.cpp b/Services/DHCPClient/main.cpp
index b65b63eb46..33e7d7e2e8 100644
--- a/Services/DHCPClient/main.cpp
+++ b/Services/DHCPClient/main.cpp
@@ -77,9 +77,10 @@ int main(int argc, char** argv)
}
auto file_contents = file->read_all();
- auto json = JsonValue::from_string(file_contents).as_array();
+ auto json = JsonValue::from_string(file_contents);
+ ASSERT(json.has_value());
Vector<InterfaceDescriptor> ifnames;
- json.for_each([&ifnames](auto& value) {
+ json.value().as_array().for_each([&ifnames](auto& value) {
auto if_object = value.as_object();
if (if_object.get("class_name").to_string() == "LoopbackAdapter")