diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-28 11:52:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-28 11:52:11 +0000 |
| commit | a914f04c23385953cb2f9b34dc879e03c880d4b2 (patch) | |
| tree | d79f62805a2f6b7e04fc82337584e036e54f8535 | |
| parent | c7e1f823aed63f49e559e7463da76d5b320be35b (diff) | |
| parent | 2d7ad7c05e762d5b10a57eba9af1bb6b41700854 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/qemu-sockets.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8b75541ce4..a1cf47e625 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -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) { |