commit e23a22e620e84f42bdbd473b82672654e7c8de73
author Jens Osterkamp <jens@linux.vnet.ibm.com> Mon Apr 12 10:51:01 2010 +0200
committer Aurelien Jarno <aurelien@aurel32.net> Tue May 18 19:49:16 2010 +0200
tree ddc9cebadadc2810e1228759ab02ea575aa4d9ab
parent 81bbe906c89b6b7af58a1eeb96ec5a0bfdc3386f

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>

qemu-sockets.c

diff --git a/qemu-sockets.c b/qemu-sockets.c
index a7399aa..c526324 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -130,7 +130,8 @@
     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;
     }