RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 15:42:44 +00:00
Code Issues Activity Actions

FileManager: Handle possible ByteBuffer allocation failure

Browse source 
Before this patch we created ByteBuffer with the help of the
VERIFY macro that could cause a crash of FileManager
in case of memory allocation failures.

Now we propagate the error to a caller instead of using the
`release_value_but_fixme_should_propagate_errors()` method.
This commit is contained in:
Alexander Narsudinov 2022-12-17 20:22:08 +03:00 • committed by Andreas Kling
parent c0542ed40b
commit 03107d4028
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/FileManager/FileOperationProgressWidget.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Alexander Narsudinov <a.narsudinov@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -71,7 +72,12 @@ FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation
m_notifier = Core::Notifier::construct(helper_pipe_fd, Core::Notifier::Read); m_notifier = Core::Notifier::construct(helper_pipe_fd, Core::Notifier::Read);
m_notifier->on_ready_to_read = [this] { m_notifier->on_ready_to_read = [this] {
auto line_buffer = ByteBuffer::create_zeroed(1 * KiB).release_value_but_fixme_should_propagate_errors(); auto line_buffer_or_error = ByteBuffer::create_zeroed(1 * KiB);
if (line_buffer_or_error.is_error()) {
did_error("Failed to allocate ByteBuffer for reading data."sv);
return;
}
auto line_buffer = line_buffer_or_error.release_value();
auto line_or_error = m_helper_pipe->read_line(line_buffer.bytes()); auto line_or_error = m_helper_pipe->read_line(line_buffer.bytes());
if (line_or_error.is_error() || line_or_error.value().is_empty()) { if (line_or_error.is_error() || line_or_error.value().is_empty()) {
did_error("Read from pipe returned null."sv); did_error("Read from pipe returned null."sv);