From 74d1eb650279d7b8512f65caad322d87db069b0f Mon Sep 17 00:00:00 2001 From: creator1creeper1 Date: Sat, 25 Dec 2021 14:19:47 +0100 Subject: [PATCH] Applets/ResourceGraph: Propagate errors in JSON decoding --- Userland/Applets/ResourceGraph/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Userland/Applets/ResourceGraph/main.cpp b/Userland/Applets/ResourceGraph/main.cpp index c4120283b7..1132affe50 100644 --- a/Userland/Applets/ResourceGraph/main.cpp +++ b/Userland/Applets/ResourceGraph/main.cpp @@ -136,7 +136,10 @@ private: } auto file_contents = m_proc_stat->read_all(); - auto json = JsonValue::from_string(file_contents).release_value_but_fixme_should_propagate_errors(); + auto json_or_error = JsonValue::from_string(file_contents); + if (json_or_error.is_error()) + return false; + auto json = json_or_error.release_value(); auto const& obj = json.as_object(); total = obj.get("total_time").to_u64(); idle = obj.get("idle_time").to_u64(); @@ -157,7 +160,10 @@ private: } auto file_contents = m_proc_mem->read_all(); - auto json = JsonValue::from_string(file_contents).release_value_but_fixme_should_propagate_errors(); + auto json_or_error = JsonValue::from_string(file_contents); + if (json_or_error.is_error()) + return false; + auto json = json_or_error.release_value(); auto const& obj = json.as_object(); unsigned kmalloc_allocated = obj.get("kmalloc_allocated").to_u32(); unsigned kmalloc_available = obj.get("kmalloc_available").to_u32();