bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

In xioshutdown() a wrong branch was chosen after RECVFROM type addresses

Browse source
This commit is contained in:
Gerhard Rieger 2014-02-03 10:51:58 +01:00
parent b732d00d30
commit 5e63eff878
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -12,6 +12,10 @@ corrections:
--disable-genericsocket in the help text. Thanks to Ben Gardiner for --disable-genericsocket in the help text. Thanks to Ben Gardiner for
reporting and patching this bug reporting and patching this bug
In xioshutdown() a wrong branch was chosen after RECVFROM type addresses.
Probably no impact.
Thanks to David Binderman for reproting this issue.
porting: porting:
Performed changes for Fedora release 19 Performed changes for Fedora release 19

5
xioshutdown.c
View file

@ -1,5 +1,5 @@
/* source: xioshutdown.c */ /* source: xioshutdown.c */
/* Copyright Gerhard Rieger 2001-2009 */ /* Copyright Gerhard Rieger */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
/* this is the source of the extended shutdown function */ /* this is the source of the extended shutdown function */
@ -127,7 +127,8 @@ int xioshutdown(xiofile_t *sock, int how) {
} }
Alarm(0); Alarm(0);
} }
} else if ((sock->stream.dtype & XIODATA_MASK) == XIODATA_RECVFROM) { } else if ((sock->stream.dtype & XIODATA_MASK) ==
(XIODATA_RECVFROM & XIODATA_MASK)) {
if (how >= 1) { if (how >= 1) {
if (Close(sock->stream.fd) < 0) { if (Close(sock->stream.fd) < 0) {
Info2("close(%d): %s", Info2("close(%d): %s",