diff options
| author | tobias <tobias@openbsd.org> | 2015-03-26 22:22:50 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-05-29 06:47:50 +0200 |
| commit | d6a81050ace2630b06c3c6dd39bb4eef5d1043f8 (patch) | |
| tree | c595ab2e2e47c021ffdf4c3711fc30118d58f6d2 /regress | |
| parent | partial sync of regress/netcat.c with upstream (diff) | |
| download | openssh-d6a81050ace2630b06c3c6dd39bb4eef5d1043f8.tar.xz openssh-d6a81050ace2630b06c3c6dd39bb4eef5d1043f8.zip | |
partial sync of regress/netcat.c with upstream
The code in socks.c writes multiple times in a row to a socket. If the socket becomes invalid between these calls (e.g. connection closed), write will throw SIGPIPE. With this patch, SIGPIPE is ignored so we can handle write's -1 return value (errno will be EPIPE). Ultimately, it leads to program exit, too -- but with nicer error message. :)
with input by and ok djm
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/netcat.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/regress/netcat.c b/regress/netcat.c index 30e49ac01..dff2364cc 100644 --- a/regress/netcat.c +++ b/regress/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.128 2015/03/26 10:36:03 tobias Exp $ */ +/* $OpenBSD: netcat.c,v 1.129 2015/03/26 21:22:50 tobias Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -44,14 +44,15 @@ #include <netinet/ip.h> #include <errno.h> +#include <fcntl.h> +#include <limits.h> #include <netdb.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <fcntl.h> -#include <limits.h> #include "atomicio.h" #ifdef HAVE_POLL_H @@ -162,6 +163,8 @@ main(int argc, char *argv[]) uport = NULL; sv = NULL; + signal(SIGPIPE, SIG_IGN); + while ((ch = getopt(argc, argv, "46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { switch (ch) { |