Patchwork [1/2] qemu-sockets: Fix parsing of the inet option 'to'.

login
register
mail settings
Submitter Stefan Hajnoczi
Date Nov. 16, 2012, 2:08 p.m.
Message ID <1353074895-3712-2-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/199625/
State New
Headers show

Comments

Stefan Hajnoczi - Nov. 16, 2012, 2:08 p.m.
From: Anthony PERARD <anthony.perard@citrix.com>

Having a qemu command line argument like "-vnc 127.0.0.1:0,to=99" is broken.
This have been break with commit 879e45c72da1569e07fbbc6a1aa2a708ea796044.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qemu-sockets.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/qemu-sockets.c b/qemu-sockets.c
index abcd791..03ca98d 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -551,8 +551,9 @@  static InetSocketAddress *inet_parse(const char *str, Error **errp)
     optstr = str + pos;
     h = strstr(optstr, ",to=");
     if (h) {
-        if (1 != sscanf(str, "%d%n", &to, &pos) ||
-            (str[pos] != '\0' && str[pos] != ',')) {
+        h += 4;
+        if (sscanf(h, "%d%n", &to, &pos) != 1 ||
+            (h[pos] != '\0' && h[pos] != ',')) {
             error_setg(errp, "error parsing to= argument");
             goto fail;
         }