From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Nov 2021 16:17:24 +0000 (+0100)
Subject: virNodeDeviceCapVPDParseCustomFields: Don't use 'virXPathStringLimit'
X-Git-Tag: v7.10.0-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f9bc6e5f65e61889cab59d38e4899d309543ea4;p=thirdparty%2Flibvirt.git

virNodeDeviceCapVPDParseCustomFields: Don't use 'virXPathStringLimit'

virXPathStringLimit doesn't give callers a way to differentiate between
the queried XPath being empty and the length limit being exceeded.

This means that callers are overwriting the error message.

Move the length checks into the caller.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index ca534dfbed..0bac0fde8d 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -955,7 +955,8 @@ virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource
         g_autofree char *keyword = NULL;
 
         ctxt->node = nodes[i];
-        if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) {
+        if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
+            strlen(index) > 1) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                     _("<vendor_field> evaluation has failed"));
             continue;
@@ -983,7 +984,8 @@ virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource
             VIR_XPATH_NODE_AUTORESTORE(ctxt);
 
             ctxt->node = nodes[i];
-            if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) {
+            if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
+                strlen(index) > 1) {
                 virReportError(VIR_ERR_XML_ERROR, "%s",
                         _("<system_field> evaluation has failed"));
                 continue;