Commit a914f04c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-11-28-1' into staging 



Merge qio 2017/11/28 v1

# gpg: Signature made Tue 28 Nov 2017 10:49:08 GMT
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2017-11-28-1:
  sockets: avoid crash when cleaning up sockets for an invalid FD

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c7e1f823 2d7ad7c0

util/qemu-sockets.c

+3 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,9 @@ void socket_listen_cleanup(int fd, Error **errp) 
    SocketAddress *addr;



    addr = socket_local_address(fd, errp);

    if (!addr) {

        return;

    }



    if (addr->type == SOCKET_ADDRESS_TYPE_UNIX

        && addr->u.q_unix.path) {