RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00
Code Issues Activity Actions

Applets/ResourceGraph: Propagate errors in JSON decoding

Browse source
This commit is contained in:
creator1creeper1 2021-12-25 14:19:47 +01:00 • committed by Andreas Kling
parent e46f08ff33
commit 74d1eb6502
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applets/ResourceGraph/main.cpp
View file

@ -136,7 +136,10 @@ private:
} }
auto file_contents = m_proc_stat->read_all(); 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(); auto const& obj = json.as_object();
total = obj.get("total_time").to_u64(); total = obj.get("total_time").to_u64();
idle = obj.get("idle_time").to_u64(); idle = obj.get("idle_time").to_u64();
@ -157,7 +160,10 @@ private:
} }
auto file_contents = m_proc_mem->read_all(); 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(); auto const& obj = json.as_object();
unsigned kmalloc_allocated = obj.get("kmalloc_allocated").to_u32(); unsigned kmalloc_allocated = obj.get("kmalloc_allocated").to_u32();
unsigned kmalloc_available = obj.get("kmalloc_available").to_u32(); unsigned kmalloc_available = obj.get("kmalloc_available").to_u32();