summaryrefslogtreecommitdiff
path: root/Applications/SystemMonitor/MemoryStatsWidget.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 /Applications/SystemMonitor/MemoryStatsWidget.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 'Applications/SystemMonitor/MemoryStatsWidget.cpp')
-rw-r--r--Applications/SystemMonitor/MemoryStatsWidget.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp
index c9ebacc268..89bd77fdc4 100644
--- a/Applications/SystemMonitor/MemoryStatsWidget.cpp
+++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp
@@ -98,7 +98,9 @@ void MemoryStatsWidget::refresh()
ASSERT_NOT_REACHED();
auto file_contents = proc_memstat->read_all();
- auto json = JsonValue::from_string(file_contents).as_object();
+ auto json_result = JsonValue::from_string(file_contents);
+ ASSERT(json_result.has_value());
+ auto json = json_result.value().as_object();
unsigned kmalloc_eternal_allocated = json.get("kmalloc_eternal_allocated").to_u32();
(void)kmalloc_eternal_allocated;