diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-26 16:38:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-26 16:38:40 +0000 |
| commit | 685783c5b69c83c942d1fc21679311eeb8f79ab9 (patch) | |
| tree | 04700b926fcc7db734a9a046f961af22c70ec1fd /slirp/socket.c | |
| parent | 6b4e463ff35284a3c02c5ceab3351bb07137c77c (diff) | |
| parent | bd5d2353aa69e68e45d8a89787bab17c155e9e24 (diff) | |
| download | focaccia-qemu-685783c5b69c83c942d1fc21679311eeb8f79ab9.tar.gz focaccia-qemu-685783c5b69c83c942d1fc21679311eeb8f79ab9.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates # gpg: Signature made Sun 26 Feb 2017 14:40:00 GMT # gpg: using RSA key 0xB0A51BF58C9179C5 # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: AEBF 7448 FAB9 453A 4552 390E B0A5 1BF5 8C91 79C5 * remotes/thibault/tags/samuel-thibault: slirp: tcp_listen(): Don't try to close() an fd we never opened slirp: Convert mbufs to use g_malloc() and g_free() slirp: Check qemu_socket() return value in udp_listen() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/socket.c')
| -rw-r--r-- | slirp/socket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index 6c18971368..86927722e1 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -713,7 +713,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, (listen(s,1) < 0)) { int tmperrno = errno; /* Don't clobber the real reason we failed */ - close(s); + if (s >= 0) { + closesocket(s); + } sofree(so); /* Restore the real errno */ #ifdef _WIN32 |