Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore broken pipe / SIGPIPE signal to avoid crash #11475

Merged
merged 2 commits into from
Oct 17, 2018
Merged

Ignore broken pipe / SIGPIPE signal to avoid crash #11475

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e221187
Ignore SIGPIPE signal receiving data to avoid crash
pleonex Oct 16, 2018
f5f9708
Fix undefined MSG_NOSIGNAL
pleonex Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ext/native/base/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
#include <unistd.h>
#endif

#ifndef MSG_NOSIGNAL
// Default value to 0x00 (do nothing) in systems where it's not supported.
#define MSG_NOSIGNAL 0x00
#endif

#include "base/logging.h"
#include "base/timeutil.h"
#include "file/fd_util.h"
Expand Down Expand Up @@ -143,7 +148,7 @@ bool Buffer::FlushToFile(const char *filename) {

bool Buffer::FlushSocket(uintptr_t sock) {
for (size_t pos = 0, end = data_.size(); pos < end; ) {
int sent = send(sock, &data_[pos], (int)(end - pos), 0);
int sent = send(sock, &data_[pos], (int)(end - pos), MSG_NOSIGNAL);
if (sent < 0) {
ELOG("FlushSocket failed");
return false;
Expand Down