lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-04 08:02:34 +03:00
Code Activity

xpath: Deprecate xmlXPathEvalExpr

Browse Source 
Also check the argument instead of crashing if there's no context.
This commit is contained in:
Nick Wellnhofer
2024-09-13 21:06:36 +02:00
parent 03f1bdd260
commit c46b89e243
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libxml/xpathInternals.h
View File

@ -516,6 +516,7 @@ XMLPUBFUN void
XMLPUBFUN void XMLPUBFUN void
xmlXPathRoot (xmlXPathParserContextPtr ctxt); xmlXPathRoot (xmlXPathParserContextPtr ctxt);
XML_DEPRECATED
XMLPUBFUN void XMLPUBFUN void
xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt);
XMLPUBFUN xmlChar * XMLPUBFUN xmlChar *

1
python/generator.py
View File

@ -407,6 +407,7 @@ deprecated_funcs = {
'xmlValidatePushElement': True, 'xmlValidatePushElement': True,
'xmlValidateRoot': True, 'xmlValidateRoot': True,
'xmlValidate': True, 'xmlValidate': True,
'xmlXPathEvalExpr': True,
'xmlXPathInit': True, 'xmlXPathInit': True,
'xmlXPtrEvalRangePredicate': True, 'xmlXPtrEvalRangePredicate': True,
'xmlXPtrNewCollapsedRange': True, 'xmlXPtrNewCollapsedRange': True,

4
xpath.c
View File

@ -12531,6 +12531,8 @@ xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp,
* xmlXPathEvalExpr: * xmlXPathEvalExpr:
* @ctxt: the XPath Parser context * @ctxt: the XPath Parser context
* *
* DEPRECATED: Internal function, don't use.
*
* Parse and evaluate an XPath expression in the given context, * Parse and evaluate an XPath expression in the given context,
* then push the result on the context stack * then push the result on the context stack
*/ */
@ -12541,7 +12543,7 @@ xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) {
#endif #endif
int oldDepth = 0; int oldDepth = 0;
if (ctxt == NULL) if ((ctxt == NULL) || (ctxt->context == NULL))
return; return;
if (ctxt->context->lastError.code != 0) if (ctxt->context->lastError.code != 0)
return; return;