RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 07:27:45 +00:00
Code Issues Activity Actions

Everywhere: Make JSON serialization fallible

Browse source 
This allows us to eliminate a major source of infallible allocation in
the Kernel, as well as lay down the groundwork for OOM fallibility in
userland.
This commit is contained in:
Idan Horowitz 2022-02-24 20:08:48 +02:00 • committed by Andreas Kling
parent 6682afb5d4
commit feb00b7105
18 changed files with 837 additions and 592 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Services/LaunchServer/Launcher.cpp
View file

@ -45,23 +45,23 @@ void Handler::from_executable(Type handler_type, const String& executable)
String Handler::to_details_str() const
{
StringBuilder builder;
JsonObjectSerializer obj { builder };
obj.add("executable", executable);
obj.add("name", name);
auto obj = MUST(JsonObjectSerializer<>::try_create(builder));
MUST(obj.add("executable", executable));
MUST(obj.add("name", name));
switch (handler_type) {
case Type::Application:
obj.add("type", "app");
MUST(obj.add("type", "app"));
break;
case Type::UserDefault:
obj.add("type", "userdefault");
MUST(obj.add("type", "userdefault"));
break;
case Type::UserPreferred:
obj.add("type", "userpreferred");
MUST(obj.add("type", "userpreferred"));
break;
default:
break;
}
obj.finish();
MUST(obj.finish());
return builder.build();
}

12
Userland/Services/WebContent/ConnectionFromClient.cpp
View file

@ -271,18 +271,18 @@ Messages::WebContentServer::InspectDomNodeResponse ConnectionFromClient::inspect
auto serialize_json = [](Web::CSS::StyleProperties const& properties) -> String {
StringBuilder builder;
JsonObjectSerializer serializer(builder);
auto serializer = MUST(JsonObjectSerializer<>::try_create(builder));
properties.for_each_property([&](auto property_id, auto& value) {
serializer.add(Web::CSS::string_from_property_id(property_id), value.to_string());
MUST(serializer.add(Web::CSS::string_from_property_id(property_id), value.to_string()));
});
serializer.finish();
MUST(serializer.finish());
return builder.to_string();
};
auto serialize_custom_properties_json = [](Web::DOM::Element const& element) -> String {
StringBuilder builder;
JsonObjectSerializer serializer(builder);
auto serializer = MUST(JsonObjectSerializer<>::try_create(builder));
HashTable<String> seen_properties;
auto const* element_to_check = &element;
@ -290,14 +290,14 @@ Messages::WebContentServer::InspectDomNodeResponse ConnectionFromClient::inspect
for (auto const& property : element_to_check->custom_properties()) {
if (!seen_properties.contains(property.key)) {
seen_properties.set(property.key);
serializer.add(property.key, property.value.value->to_string());
MUST(serializer.add(property.key, property.value.value->to_string()));
}
}
element_to_check = element_to_check->parent_element();
}
serializer.finish();
MUST(serializer.finish());
return builder.to_string();
};