[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails |
Date: |
Wed, 20 May 2015 10:34:11 +0200 |
From: Cole Robinson <address@hidden>
Reproducer:
$ qemu-system-x86_64 -display vnc=unix:/root/i-cant-access-you.sock
qemu-system-x86_64: iohandler.c:60: qemu_set_fd_handler2: Assertion `fd >= 0'
failed.
Aborted (core dumped)
Signed-off-by: Cole Robinson <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 076355d..fe4cd75 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3684,6 +3684,9 @@ void vnc_display_open(const char *id, Error **errp)
/* listen for connects */
if (strncmp(vnc, "unix:", 5) == 0) {
vs->lsock = unix_listen(vnc+5, NULL, 0, errp);
+ if (vs->lsock < 0) {
+ goto fail;
+ }
vs->is_unix = true;
} else {
vs->lsock = inet_listen_opts(sopts, 5900, errp);
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] vnc patch queue, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 4/5] vnc: Tweak error when init fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init(), Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 5/5] qemu-sockets: Report explicit error if unlink fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 1/5] Strip brackets from vnc host, Gerd Hoffmann, 2015/05/20
- Re: [Qemu-devel] [PULL 0/5] vnc patch queue, Peter Maydell, 2015/05/21