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

DHCPClient: handle /proc/net/adapters invalid JSON gracefully

Browse source
This commit is contained in:
Brendan Coles 2021-01-13 07:15:30 +00:00 • committed by Andreas Kling
parent ff7dee49f6
commit 2f65363488
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Services/DHCPClient/main.cpp
View file

@ -69,13 +69,18 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
auto file = Core::File::construct("/proc/net/adapters"); auto file = Core::File::construct("/proc/net/adapters");
if (!file->open(Core::IODevice::ReadOnly)) { if (!file->open(Core::IODevice::ReadOnly)) {
fprintf(stderr, "Error: %s\n", file->error_string()); warnln("Error: {}", file->error_string());
return 1; return 1;
} }
auto file_contents = file->read_all(); auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents); auto json = JsonValue::from_string(file_contents);
ASSERT(json.has_value());
if (!json.has_value() || !json.value().is_array()) {
warnln("Error: No network adapters available");
return 1;
}
Vector<InterfaceDescriptor> ifnames; Vector<InterfaceDescriptor> ifnames;
json.value().as_array().for_each([&ifnames](auto& value) { json.value().as_array().for_each([&ifnames](auto& value) {
auto if_object = value.as_object(); auto if_object = value.as_object();