dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibRequests: Propagate body file mapping failures

Browse source 
A failed client-side mmap of a file-backed response body could leave
the request to finish successfully with no delivered bytes. Remember the
local delivery error and prefer it over the RequestServer result when
finishing the request.
This commit is contained in:
Andreas Kling 2026-05-15 16:24:03 +02:00 committed by Andreas Kling
parent 8ee6e38fd1
commit e43f28dd7f
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibRequests/Request.cpp
View file

@ -86,8 +86,11 @@ void Request::set_request_fd(Badge<Requests::RequestClient>, int fd)
void Request::set_request_body_file(Badge<Requests::RequestClient>, int fd, u64 offset, u64 size)
{
auto payload = map_body_file(fd, offset, size);
if (!payload.has_value())
if (!payload.has_value()) {
if (m_internal_stream_data)
m_body_delivery_error = NetworkError::CacheReadFailed;
return;
}
// If the request was stopped while this IPC was in-flight, just bail.
if (!m_internal_stream_data)
@ -180,8 +183,9 @@ void Request::set_unbuffered_request_callbacks(HeadersReceived on_headers_receiv
void Request::did_finish(Badge<RequestClient>, u64 total_size, RequestTimingInfo const& timing_info, Optional<NetworkError> const& network_error)
{
auto effective_network_error = m_body_delivery_error.has_value() ? m_body_delivery_error : network_error;
if (on_finish)
on_finish(total_size, timing_info, network_error);
on_finish(total_size, timing_info, effective_network_error);
}
void Request::did_receive_headers(Badge<RequestClient>, NonnullRefPtr<HTTP::HeaderList> response_headers, Optional<u32> response_code, Optional<String> const& reason_phrase, Optional<Core::AnonymousBuffer> javascript_bytecode, Optional<u64> javascript_bytecode_cache_vary_key)

1
Libraries/LibRequests/Request.h
View file

@ -167,6 +167,7 @@ private:
OwnPtr<InternalBufferedData> m_internal_buffered_data;
OwnPtr<InternalStreamData> m_internal_stream_data;
Optional<NetworkError> m_body_delivery_error;
};
}