beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Userland: Don't leak objects when constructor arguments throw

Browse source 
Similar to d253beb2f7.

Found with Ali's clang-query script in Shell:

```
for $(find AK Userland -type f -name '*.h' -o -name '*.cpp') {
    in_parallel -j 12 -- clang-query -p \
    Build/lagom/compile_commands.json $it -c \
    'm cxxNewExpr(has(cxxConstructExpr(hasAnyArgument(hasDescendant( \
        allOf(isExpandedFromMacro("TRY"), stmtExpr()))))))' \
    } | grep -v 'matches.' | tee results
```
This commit is contained in:
Andrew Kaster 2023-12-13 15:45:32 -07:00 committed by Andrew Kaster
parent d253beb2f7
commit c145d5410c
Notes: sideshowbarker 2024-07-17 08:13:43 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/SerenityOS/serenity/commit/c145d5410c
Pull-request: https://github.com/SerenityOS/serenity/pull/22282
Reviewed-by: https://github.com/alimpfard ✅
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibAudio/Loader.cpp
View file

@ -45,13 +45,15 @@ static constexpr LoaderPluginInitializer s_initializers[] = {
ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(StringView path) ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(StringView path)
{ {
auto stream = TRY(Core::MappedFile::map(path, Core::MappedFile::Mode::ReadOnly)); auto stream = TRY(Core::MappedFile::map(path, Core::MappedFile::Mode::ReadOnly));
return adopt_ref(*new (nothrow) Loader(TRY(Loader::create_plugin(move(stream))))); auto plugin = TRY(Loader::create_plugin(move(stream)));
return adopt_ref(*new (nothrow) Loader(move(plugin)));
} }
ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(ReadonlyBytes buffer) ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(ReadonlyBytes buffer)
{ {
auto stream = TRY(try_make<FixedMemoryStream>(buffer)); auto stream = TRY(try_make<FixedMemoryStream>(buffer));
return adopt_ref(*new (nothrow) Loader(TRY(Loader::create_plugin(move(stream))))); auto plugin = TRY(Loader::create_plugin(move(stream)));
return adopt_ref(*new (nothrow) Loader(move(plugin)));
} }
ErrorOr<NonnullOwnPtr<LoaderPlugin>, LoaderError> Loader::create_plugin(NonnullOwnPtr<SeekableStream> stream) ErrorOr<NonnullOwnPtr<LoaderPlugin>, LoaderError> Loader::create_plugin(NonnullOwnPtr<SeekableStream> stream)

11
Userland/Libraries/LibChess/UCICommand.cpp
View file

@ -94,9 +94,9 @@ ErrorOr<NonnullOwnPtr<SetOptionCommand>> SetOptionCommand::from_string(StringVie
VERIFY(!name.is_empty()); VERIFY(!name.is_empty());
return adopt_nonnull_own_or_enomem(new (nothrow) SetOptionCommand( auto name_string = TRY(String::from_utf8(name.string_view().trim_whitespace()));
TRY(String::from_utf8(name.string_view().trim_whitespace())), auto value_string = TRY(String::from_utf8(value.string_view().trim_whitespace()));
TRY(String::from_utf8(value.string_view().trim_whitespace())))); return adopt_nonnull_own_or_enomem(new (nothrow) SetOptionCommand(name_string, value_string));
} }
ErrorOr<String> SetOptionCommand::to_string() const ErrorOr<String> SetOptionCommand::to_string() const
@ -259,10 +259,11 @@ ErrorOr<NonnullOwnPtr<IdCommand>> IdCommand::from_string(StringView command)
TRY(value.try_append(tokens[i])); TRY(value.try_append(tokens[i]));
} }
auto value_string = TRY(value.to_string());
if (tokens[1] == "name") { if (tokens[1] == "name") {
return adopt_nonnull_own_or_enomem(new (nothrow) IdCommand(Type::Name, TRY(value.to_string()))); return adopt_nonnull_own_or_enomem(new (nothrow) IdCommand(Type::Name, value_string));
} else if (tokens[1] == "author") { } else if (tokens[1] == "author") {
return adopt_nonnull_own_or_enomem(new (nothrow) IdCommand(Type::Author, TRY(value.to_string()))); return adopt_nonnull_own_or_enomem(new (nothrow) IdCommand(Type::Author, value_string));
} }
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

8
Userland/Libraries/LibGUI/InputBox.cpp
View file

@ -19,14 +19,18 @@ namespace GUI {
ErrorOr<NonnullRefPtr<InputBox>> InputBox::create(Window* parent_window, String text_value, StringView prompt, StringView title, InputType input_type, RefPtr<Gfx::Bitmap const> icon) ErrorOr<NonnullRefPtr<InputBox>> InputBox::create(Window* parent_window, String text_value, StringView prompt, StringView title, InputType input_type, RefPtr<Gfx::Bitmap const> icon)
{ {
VERIFY(input_type != InputType::Numeric); VERIFY(input_type != InputType::Numeric);
auto box = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) InputBox(parent_window, text_value, TRY(String::from_utf8(title)), TRY(String::from_utf8(prompt)), input_type, move(icon)))); auto title_string = TRY(String::from_utf8(title));
auto prompt_string = TRY(String::from_utf8(prompt));
auto box = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) InputBox(parent_window, text_value, title_string, prompt_string, input_type, move(icon))));
TRY(box->build()); TRY(box->build());
return box; return box;
} }
ErrorOr<NonnullRefPtr<InputBox>> InputBox::create_numeric(Window* parent_window, int value, StringView title, StringView prompt, RefPtr<Gfx::Bitmap const> icon) ErrorOr<NonnullRefPtr<InputBox>> InputBox::create_numeric(Window* parent_window, int value, StringView title, StringView prompt, RefPtr<Gfx::Bitmap const> icon)
{ {
auto box = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) InputBox(parent_window, value, TRY(String::from_utf8(title)), TRY(String::from_utf8(prompt)), move(icon)))); auto title_string = TRY(String::from_utf8(title));
auto prompt_string = TRY(String::from_utf8(prompt));
auto box = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) InputBox(parent_window, value, title_string, prompt_string, move(icon))));
TRY(box->build()); TRY(box->build());
return box; return box;
} }

6
Userland/Shell/Shell.cpp
View file

@ -420,8 +420,10 @@ ErrorOr<RefPtr<AST::Value const>> Shell::look_up_local_variable(StringView name)
ErrorOr<RefPtr<AST::Value const>> Shell::get_argument(size_t index) const ErrorOr<RefPtr<AST::Value const>> Shell::get_argument(size_t index) const
{ {
if (index == 0) if (index == 0) {
return adopt_ref(*new AST::StringValue(TRY(String::from_deprecated_string(current_script)))); auto current_script_string = TRY(String::from_deprecated_string(current_script));
return adopt_ref(*new AST::StringValue(current_script_string));
}
--index; --index;
if (auto argv = TRY(look_up_local_variable("ARGV"sv))) { if (auto argv = TRY(look_up_local_variable("ARGV"sv))) {