From: Jens Osterkamp <jens@linux.vnet.ibm.com>
Date: Mon, 12 Apr 2010 08:51:01 +0000 (+0200)
Subject: qemu-sockets: avoid strlen of NULL pointer
X-Git-Tag: v0.12.5~40
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e1f0c1d05d3f96c7471cca1a6991b63574e00b52;p=qemu.git

qemu-sockets: avoid strlen of NULL pointer

If the user wants to create a chardev of type socket but forgets to give a
host= option, qemu_opt_get returns NULL. This NULL pointer is then fed into
strlen a few lines below without a check which results in a segfault.
This fixes it.

Signed-off-by: Jens Osterkamp <jens@linux.vnet.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit e23a22e620e84f42bdbd473b82672654e7c8de73)
---

diff --git a/qemu-sockets.c b/qemu-sockets.c
index a88b2a77f..993ce1215 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -130,7 +130,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
     ai.ai_family = PF_UNSPEC;
     ai.ai_socktype = SOCK_STREAM;
 
-    if (qemu_opt_get(opts, "port") == NULL) {
+    if ((qemu_opt_get(opts, "host") == NULL) ||
+        (qemu_opt_get(opts, "port") == NULL)) {
         fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__);
         return -1;
     }