diff options
| -rw-r--r-- | include/libxml/xpath.h | 2 | ||||
| -rw-r--r-- | xpath.c | 57 |
2 files changed, 5 insertions, 54 deletions
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 8a70ddc2..b57985a2 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -400,7 +400,7 @@ struct _xmlXPathParserContext { int xptr; /* it this an XPointer expression */ xmlNodePtr ancestor; /* used for walking preceding axis */ - int valueFrame; /* used to limit Pop on the stack */ + int valueFrame; /* unused */ }; /************************************************************************ @@ -2834,42 +2834,6 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { ************************************************************************/ /** - * xmlXPathSetFrame: - * @ctxt: an XPath parser context - * - * Set the callee evaluation frame - * - * Returns the previous frame value to be restored once done - */ -static int -xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { - int ret; - - if (ctxt == NULL) - return(0); - ret = ctxt->valueFrame; - ctxt->valueFrame = ctxt->valueNr; - return(ret); -} - -/** - * xmlXPathPopFrame: - * @ctxt: an XPath parser context - * @frame: the previous frame value - * - * Remove the callee evaluation frame - */ -static void -xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { - if (ctxt == NULL) - return; - if (ctxt->valueNr < ctxt->valueFrame) { - xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); - } - ctxt->valueFrame = frame; -} - -/** * valuePop: * @ctxt: an XPath evaluation context * @@ -2885,11 +2849,6 @@ valuePop(xmlXPathParserContextPtr ctxt) if ((ctxt == NULL) || (ctxt->valueNr <= 0)) return (NULL); - if (ctxt->valueNr <= ctxt->valueFrame) { - xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); - return (NULL); - } - ctxt->valueNr--; if (ctxt->valueNr > 0) ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; @@ -6325,7 +6284,6 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { ret->valueNr = 0; ret->valueMax = 10; ret->value = NULL; - ret->valueFrame = 0; ret->context = ctxt; ret->comp = comp; @@ -13205,20 +13163,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) int i; int frame; - frame = xmlXPathSetFrame(ctxt); + frame = ctxt->valueNr; if (op->ch1 != -1) { total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); - if (ctxt->error != XPATH_EXPRESSION_OK) { - xmlXPathPopFrame(ctxt, frame); + if (ctxt->error != XPATH_EXPRESSION_OK) break; - } } - if (ctxt->valueNr < ctxt->valueFrame + op->value) { + if (ctxt->valueNr < frame + op->value) { xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; - xmlXPathPopFrame(ctxt, frame); break; } for (i = 0; i < op->value; i++) { @@ -13226,7 +13181,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; - xmlXPathPopFrame(ctxt, frame); break; } } @@ -13245,7 +13199,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", (char *)op->value4, (char *)op->value5); - xmlXPathPopFrame(ctxt, frame); ctxt->error = XPATH_UNDEF_PREFIX_ERROR; break; } @@ -13269,9 +13222,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) ctxt->context->function = oldFunc; ctxt->context->functionURI = oldFuncURI; if ((ctxt->error == XPATH_EXPRESSION_OK) && - (ctxt->valueNr != ctxt->valueFrame + 1)) + (ctxt->valueNr != frame + 1)) XP_ERROR0(XPATH_STACK_ERROR); - xmlXPathPopFrame(ctxt, frame); break; } case XPATH_OP_ARG: @@ -13952,7 +13904,6 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; - ctxt->valueFrame = 0; } #ifdef XPATH_STREAMING if (ctxt->comp->stream) { |