From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 6 Dec 2012 11:25:50 +0000 (+0100)
Subject: dnsmasq: Fix parsing of the version number
X-Git-Tag: v1.0.1-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5114431396fd125b6ebe4d1a20a981111f948ee7;p=thirdparty%2Flibvirt.git

dnsmasq: Fix parsing of the version number

If the debugging is enabled, the virCommand subsystem catches debug
messages in the command output as well. In that case, we can't assume
the string corresponding to command's stdout will start with specific
prefix. But the prefix can be moved deeper in the string. This bug
shows itself when parsing dnsmasq output:

2012-12-06 11:18:11.445+0000: 18491: error :
dnsmasqCapsSetFromBuffer:664 : internal error cannot parse
/usr/sbin/dnsmasq version number in '2012-12-06 11:11:02.232+0000:
18492: debug : virFileClose:72 : Closed fd 22'

We can clearly see that the output of dnsmasq --version
doesn't start with expected "Dnsmasq version " string but a libvirt
debug output.
---

diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index 4f210d2130..de0293a565 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf)
 
     caps->noRefresh = true;
 
-    p = STRSKIP(buf, DNSMASQ_VERSION_STR);
-    if (!p)
+    if (!(p = strstr(buf, DNSMASQ_VERSION_STR)))
        goto fail;
+    p += sizeof(DNSMASQ_VERSION_STR) - 1;
     virSkipSpaces(&p);
     if (virParseVersionString(p, &caps->version, true) < 0)
         goto fail;