summaryrefslogtreecommitdiff
path: root/DevTools/ProfileViewer/Profile.cpp
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 /DevTools/ProfileViewer/Profile.cpp
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 'DevTools/ProfileViewer/Profile.cpp')
-rw-r--r--DevTools/ProfileViewer/Profile.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/DevTools/ProfileViewer/Profile.cpp b/DevTools/ProfileViewer/Profile.cpp
index 435bfd2810..32c966bbb5 100644
--- a/DevTools/ProfileViewer/Profile.cpp
+++ b/DevTools/ProfileViewer/Profile.cpp
@@ -172,12 +172,13 @@ OwnPtr<Profile> Profile::load_from_perfcore_file(const StringView& path)
}
auto json = JsonValue::from_string(file->read_all());
- if (!json.is_object()) {
+ ASSERT(json.has_value());
+ if (!json.value().is_object()) {
fprintf(stderr, "Invalid perfcore format (not a JSON object)\n");
return nullptr;
}
- auto& object = json.as_object();
+ auto& object = json.value().as_object();
auto executable_path = object.get("executable").to_string();
MappedFile elf_file(executable_path);