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

Kernel: Use TRY to handle string copies in GlobalProcessExposed

Browse source 
Each of these string copies are already inside of an ErrorOr context so
any failed copy should propagate.
This commit is contained in:
brapru 2022-04-26 22:04:29 -04:00 • committed by Brian Gianforcaro
parent 8596b1e0c3
commit 419cd479e2
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/GlobalProcessExposed.cpp
View file

@ -47,16 +47,16 @@ private:
auto obj = TRY(array.add_object());
TRY(obj.add("name", adapter.name()));
TRY(obj.add("class_name", adapter.class_name()));
auto mac_address = adapter.mac_address().to_string().release_value_but_fixme_should_propagate_errors();
auto mac_address = TRY(adapter.mac_address().to_string());
TRY(obj.add("mac_address", mac_address->view()));
if (!adapter.ipv4_address().is_zero()) {
auto ipv4_address = adapter.ipv4_address().to_string().release_value_but_fixme_should_propagate_errors();
auto ipv4_address = TRY(adapter.ipv4_address().to_string());
TRY(obj.add("ipv4_address", ipv4_address->view()));
auto ipv4_netmask = adapter.ipv4_netmask().to_string().release_value_but_fixme_should_propagate_errors();
auto ipv4_netmask = TRY(adapter.ipv4_netmask().to_string());
TRY(obj.add("ipv4_netmask", ipv4_netmask->view()));
}
if (!adapter.ipv4_gateway().is_zero()) {
auto ipv4_gateway = adapter.ipv4_gateway().to_string().release_value_but_fixme_should_propagate_errors();
auto ipv4_gateway = TRY(adapter.ipv4_gateway().to_string());
TRY(obj.add("ipv4_gateway", ipv4_gateway->view()));
}
TRY(obj.add("packets_in", adapter.packets_in()));
@ -87,9 +87,9 @@ private:
TRY(arp_table().with([&](auto const& table) -> ErrorOr<void> {
for (auto& it : table) {
auto obj = TRY(array.add_object());
auto mac_address = it.value.to_string().release_value_but_fixme_should_propagate_errors();
auto mac_address = TRY(it.value.to_string());
TRY(obj.add("mac_address", mac_address->view()));
auto ip_address = it.key.to_string().release_value_but_fixme_should_propagate_errors();
auto ip_address = TRY(it.key.to_string());
TRY(obj.add("ip_address", ip_address->view()));
TRY(obj.finish());
}
@ -111,10 +111,10 @@ private:
auto array = TRY(JsonArraySerializer<>::try_create(builder));
TRY(TCPSocket::try_for_each([&array](auto& socket) -> ErrorOr<void> {
auto obj = TRY(array.add_object());
auto local_address = socket.local_address().to_string().release_value_but_fixme_should_propagate_errors();
auto local_address = TRY(socket.local_address().to_string());
TRY(obj.add("local_address", local_address->view()));
TRY(obj.add("local_port", socket.local_port()));
auto peer_address = socket.peer_address().to_string().release_value_but_fixme_should_propagate_errors();
auto peer_address = TRY(socket.peer_address().to_string());
TRY(obj.add("peer_address", peer_address->view()));
TRY(obj.add("peer_port", socket.peer_port()));
TRY(obj.add("state", TCPSocket::to_string(socket.state())));
@ -174,10 +174,10 @@ private:
auto array = TRY(JsonArraySerializer<>::try_create(builder));
TRY(UDPSocket::try_for_each([&array](auto& socket) -> ErrorOr<void> {
auto obj = TRY(array.add_object());
auto local_address = socket.local_address().to_string().release_value_but_fixme_should_propagate_errors();
auto local_address = TRY(socket.local_address().to_string());
TRY(obj.add("local_address", local_address->view()));
TRY(obj.add("local_port", socket.local_port()));
auto peer_address = socket.peer_address().to_string().release_value_but_fixme_should_propagate_errors();
auto peer_address = TRY(socket.peer_address().to_string());
TRY(obj.add("peer_address", peer_address->view()));
TRY(obj.add("peer_port", socket.peer_port()));
if (Process::current().is_superuser() || Process::current().uid() == socket.origin_uid()) {