External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: xml: Remove virXMLPropStringLimit and virXPathStringLimit

Browse Source 
The functions have very difficult semantics where callers are not able
to tell whether the property is missing or failed the length check. Only
the latter produces errors.

Since usage of the functions was phased out, remove them completely to
avoid further broken code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-11-22 17:44:49 +01:00
parent 01ab6513bd
commit c1a85daf99
3 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -3627,7 +3627,6 @@ virXMLPropEnum;
virXMLPropEnumDefault;
virXMLPropInt;
virXMLPropString;
virXMLPropStringLimit;
virXMLPropTristateBool;
virXMLPropTristateSwitch;
virXMLPropUInt;
@ -3648,7 +3647,6 @@ virXPathNode;
virXPathNodeSet;
virXPathNumber;
virXPathString;
virXPathStringLimit;
virXPathUInt;
virXPathULong;
virXPathULongHex;

62
src/util/virxml.c
View File

@ -89,45 +89,6 @@ virXPathString(const char *xpath,
}
static char *
virXMLStringLimitInternal(char *value,
size_t maxlen,
const char *name)
{
if (value != NULL && strlen(value) >= maxlen) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("'%s' value longer than '%zu' bytes"),
name, maxlen);
VIR_FREE(value);
return NULL;
}
return value;
}
/**
* virXPathStringLimit:
* @xpath: the XPath string to evaluate
* @maxlen: maximum length permitted string
* @ctxt: an XPath context
*
* Wrapper for virXPathString, which validates the length of the returned
* string.
*
* Returns a new string which must be deallocated by the caller or NULL if
* the evaluation failed.
*/
char *
virXPathStringLimit(const char *xpath,
size_t maxlen,
xmlXPathContextPtr ctxt)
{
char *tmp = virXPathString(xpath, ctxt);
return virXMLStringLimitInternal(tmp, maxlen, xpath);
}
/**
* virXPathNumber:
* @xpath: the XPath string to evaluate
@ -492,29 +453,6 @@ virXMLPropString(xmlNodePtr node,
}
/**
* virXMLPropStringLimit:
* @node: XML dom node pointer
* @name: Name of the property (attribute) to get
* @maxlen: maximum permitted length of the string
*
* Wrapper for virXMLPropString, which validates the length of the returned
* string.
*
* Returns a new string which must be deallocated by the caller or NULL if
* the evaluation failed.
*/
char *
virXMLPropStringLimit(xmlNodePtr node,
const char *name,
size_t maxlen)
{
char *tmp = (char *)xmlGetProp(node, BAD_CAST name);
return virXMLStringLimitInternal(tmp, maxlen, name);
}
/**
* virXMLNodeContentString:
* @node: XML dom node pointer

8
src/util/virxml.h
View File

@ -47,10 +47,6 @@ virXPathBoolean(const char *xpath,
char *
virXPathString(const char *xpath,
xmlXPathContextPtr ctxt);
char *
virXPathStringLimit(const char *xpath,
size_t maxlen,
xmlXPathContextPtr ctxt);
int
virXPathNumber(const char *xpath,
xmlXPathContextPtr ctxt,
@ -98,10 +94,6 @@ char *
virXMLPropString(xmlNodePtr node,
const char *name);
char *
virXMLPropStringLimit(xmlNodePtr node,
const char *name,
size_t maxlen);
char *
virXMLNodeContentString(xmlNodePtr node);
int