Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 17:44:56 +09:00
Code Activity

LibCore: Prevent SIGPIPE on Sockets by default

Browse source 
While this is the default for an underlying socket, it doesn't seem good
to have this as the default for our socket wrapper.

This fixes a crash in ladybird when connecting to the python HTTP server
with HTTPS.
This commit is contained in:
Shannon Booth 2024-04-05 00:07:32 +02:00 • committed by Tim Schumacher
parent f3053f1d01
commit aab5d4e6f9
Notes: sideshowbarker 2024-07-17 02:37:08 +09:00
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/LocalServer.cpp
View file

@ -133,7 +133,7 @@ ErrorOr<NonnullOwnPtr<LocalSocket>> LocalServer::accept()
(void)fcntl(accepted_fd, F_SETFD, FD_CLOEXEC); (void)fcntl(accepted_fd, F_SETFD, FD_CLOEXEC);
#endif #endif
return LocalSocket::adopt_fd(accepted_fd, Socket::PreventSIGPIPE::Yes); return LocalSocket::adopt_fd(accepted_fd);
} }
} }

14
Userland/Libraries/LibCore/Socket.h
View file

@ -68,7 +68,7 @@ protected:
Inet, Inet,
}; };
Socket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::No) explicit Socket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::Yes)
: m_prevent_sigpipe(prevent_sigpipe == PreventSIGPIPE::Yes) : m_prevent_sigpipe(prevent_sigpipe == PreventSIGPIPE::Yes)
{ {
} }
@ -87,7 +87,7 @@ protected:
} }
private: private:
bool m_prevent_sigpipe { false }; bool m_prevent_sigpipe { true };
}; };
/// A reusable socket maintains state about being connected in addition to /// A reusable socket maintains state about being connected in addition to
@ -195,7 +195,7 @@ public:
virtual ~TCPSocket() override { close(); } virtual ~TCPSocket() override { close(); }
private: private:
TCPSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::No) explicit TCPSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::Yes)
: Socket(prevent_sigpipe) : Socket(prevent_sigpipe)
{ {
} }
@ -269,7 +269,7 @@ public:
virtual ~UDPSocket() override { close(); } virtual ~UDPSocket() override { close(); }
private: private:
UDPSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::No) explicit UDPSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::Yes)
: Socket(prevent_sigpipe) : Socket(prevent_sigpipe)
{ {
} }
@ -290,8 +290,8 @@ private:
class LocalSocket final : public Socket { class LocalSocket final : public Socket {
public: public:
static ErrorOr<NonnullOwnPtr<LocalSocket>> connect(ByteString const& path, PreventSIGPIPE = PreventSIGPIPE::No); static ErrorOr<NonnullOwnPtr<LocalSocket>> connect(ByteString const& path, PreventSIGPIPE = PreventSIGPIPE::Yes);
static ErrorOr<NonnullOwnPtr<LocalSocket>> adopt_fd(int fd, PreventSIGPIPE = PreventSIGPIPE::No); static ErrorOr<NonnullOwnPtr<LocalSocket>> adopt_fd(int fd, PreventSIGPIPE = PreventSIGPIPE::Yes);
LocalSocket(LocalSocket&& other) LocalSocket(LocalSocket&& other)
: Socket(static_cast<Socket&&>(other)) : Socket(static_cast<Socket&&>(other))
@ -343,7 +343,7 @@ public:
virtual ~LocalSocket() { close(); } virtual ~LocalSocket() { close(); }
private: private:
LocalSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::No) explicit LocalSocket(PreventSIGPIPE prevent_sigpipe = PreventSIGPIPE::Yes)
: Socket(prevent_sigpipe) : Socket(prevent_sigpipe)
{ {
} }

8
Userland/Libraries/LibWeb/HTML/MessagePort.cpp
View file

@ -107,12 +107,12 @@ WebIDL::ExceptionOr<void> MessagePort::transfer_receiving_steps(HTML::TransferDa
auto fd_tag = data_holder.data.take_first(); auto fd_tag = data_holder.data.take_first();
if (fd_tag == IPC_FILE_TAG) { if (fd_tag == IPC_FILE_TAG) {
auto fd = data_holder.fds.take_first(); auto fd = data_holder.fds.take_first();
m_socket = MUST(Core::LocalSocket::adopt_fd(fd.take_fd(), Core::LocalSocket::PreventSIGPIPE::Yes)); m_socket = MUST(Core::LocalSocket::adopt_fd(fd.take_fd()));
fd_tag = data_holder.data.take_first(); fd_tag = data_holder.data.take_first();
VERIFY(fd_tag == IPC_FILE_TAG); VERIFY(fd_tag == IPC_FILE_TAG);
fd = data_holder.fds.take_first(); fd = data_holder.fds.take_first();
m_fd_passing_socket = MUST(Core::LocalSocket::adopt_fd(fd.take_fd(), Core::LocalSocket::PreventSIGPIPE::Yes)); m_fd_passing_socket = MUST(Core::LocalSocket::adopt_fd(fd.take_fd()));
m_socket->on_ready_to_read = [strong_this = JS::make_handle(this)]() { m_socket->on_ready_to_read = [strong_this = JS::make_handle(this)]() {
strong_this->read_from_socket(); strong_this->read_from_socket();
@ -155,10 +155,10 @@ void MessagePort::entangle_with(MessagePort& remote_port)
auto create_paired_sockets = []() -> Array<NonnullOwnPtr<Core::LocalSocket>, 2> { auto create_paired_sockets = []() -> Array<NonnullOwnPtr<Core::LocalSocket>, 2> {
int fds[2] = {}; int fds[2] = {};
MUST(Core::System::socketpair(AF_LOCAL, SOCK_STREAM, 0, fds)); MUST(Core::System::socketpair(AF_LOCAL, SOCK_STREAM, 0, fds));
auto socket0 = MUST(Core::LocalSocket::adopt_fd(fds[0], Core::LocalSocket::PreventSIGPIPE::Yes)); auto socket0 = MUST(Core::LocalSocket::adopt_fd(fds[0]));
MUST(socket0->set_blocking(false)); MUST(socket0->set_blocking(false));
MUST(socket0->set_close_on_exec(true)); MUST(socket0->set_close_on_exec(true));
auto socket1 = MUST(Core::LocalSocket::adopt_fd(fds[1], Core::LocalSocket::PreventSIGPIPE::Yes)); auto socket1 = MUST(Core::LocalSocket::adopt_fd(fds[1]));
MUST(socket1->set_blocking(false)); MUST(socket1->set_blocking(false));
MUST(socket1->set_close_on_exec(true)); MUST(socket1->set_close_on_exec(true));