lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Code Activity

Improve restoring of context size and position

Browse Source 
Restore context size and position where it is modified, not in
seemingly random places.
This commit is contained in:
Nick Wellnhofer
2017-05-25 00:45:10 +02:00
parent 665df41dcc
commit fa33bf317a
1 changed files with 54 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
xpath.c
View File

@@ -11661,6 +11661,7 @@ xmlXPathCompOpEvalPredicate(xmlXPathParserContextPtr ctxt,
xmlXPathContextPtr xpctxt = ctxt->context; xmlXPathContextPtr xpctxt = ctxt->context;
xmlNodePtr contextNode, oldContextNode; xmlNodePtr contextNode, oldContextNode;
xmlDocPtr oldContextDoc; xmlDocPtr oldContextDoc;
int oldcs, oldpp;
int i, res, contextPos = 0, newContextSize; int i, res, contextPos = 0, newContextSize;
xmlXPathStepOpPtr exprOp; xmlXPathStepOpPtr exprOp;
xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
@@ -11697,6 +11698,8 @@ xmlXPathCompOpEvalPredicate(xmlXPathParserContextPtr ctxt,
*/ */
oldContextNode = xpctxt->node; oldContextNode = xpctxt->node;
oldContextDoc = xpctxt->doc; oldContextDoc = xpctxt->doc;
oldcs = xpctxt->contextSize;
oldpp = xpctxt->proximityPosition;
/* /*
* Get the expression of this predicate. * Get the expression of this predicate.
*/ */
@@ -11783,8 +11786,8 @@ evaluation_exit:
*/ */
xpctxt->node = oldContextNode; xpctxt->node = oldContextNode;
xpctxt->doc = oldContextDoc; xpctxt->doc = oldContextDoc;
xpctxt->contextSize = -1; xpctxt->contextSize = oldcs;
xpctxt->proximityPosition = -1; xpctxt->proximityPosition = oldpp;
return(newContextSize); return(newContextSize);
} }
return(contextSize); return(contextSize);
@@ -11827,6 +11830,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
return (contextSize); return (contextSize);
} else { } else {
xmlDocPtr oldContextDoc; xmlDocPtr oldContextDoc;
int oldcs, oldpp;
int i, pos = 0, newContextSize = 0, contextPos = 0, res; int i, pos = 0, newContextSize = 0, contextPos = 0, res;
xmlXPathStepOpPtr exprOp; xmlXPathStepOpPtr exprOp;
xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
@@ -11847,6 +11851,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
*/ */
oldContextNode = xpctxt->node; oldContextNode = xpctxt->node;
oldContextDoc = xpctxt->doc; oldContextDoc = xpctxt->doc;
oldcs = xpctxt->contextSize;
oldpp = xpctxt->proximityPosition;
/* /*
* Get the expression of this predicate. * Get the expression of this predicate.
*/ */
@@ -11983,8 +11989,8 @@ evaluation_exit:
*/ */
xpctxt->node = oldContextNode; xpctxt->node = oldContextNode;
xpctxt->doc = oldContextDoc; xpctxt->doc = oldContextDoc;
xpctxt->contextSize = -1; xpctxt->contextSize = oldcs;
xpctxt->proximityPosition = -1; xpctxt->proximityPosition = oldpp;
return(newContextSize); return(newContextSize);
} }
return(contextSize); return(contextSize);
@@ -12829,8 +12835,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
int total = 0, cur; int total = 0, cur;
xmlXPathCompExprPtr comp; xmlXPathCompExprPtr comp;
xmlXPathObjectPtr arg1, arg2; xmlXPathObjectPtr arg1, arg2;
int pp;
int cs;
CHECK_ERROR0; CHECK_ERROR0;
comp = ctxt->comp; comp = ctxt->comp;
@@ -12838,8 +12842,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
case XPATH_OP_END: case XPATH_OP_END:
return (0); return (0);
case XPATH_OP_UNION: case XPATH_OP_UNION:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total = total =
xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch1], last); xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch1], last);
CHECK_ERROR0; CHECK_ERROR0;
@@ -12857,8 +12859,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
nodesetval->nodeNr - nodesetval->nodeNr -
1]; 1];
} }
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
cur = cur =
xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch2], last); xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch2], last);
CHECK_ERROR0; CHECK_ERROR0;
@@ -12942,6 +12942,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode; xmlNodePtr oldnode;
xmlDocPtr oldDoc; xmlDocPtr oldDoc;
int oldcs, oldpp;
int i; int i;
CHECK_ERROR0; CHECK_ERROR0;
@@ -13015,6 +13016,8 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldlocset = obj->user; oldlocset = obj->user;
oldnode = ctxt->context->node; oldnode = ctxt->context->node;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
@@ -13039,9 +13042,8 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
if (op->ch2 != -1) if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
ctxt->context->node = oldnode; goto xptr_error;
return(0);
} }
/* /*
* The result of the evaluation need to be tested to * The result of the evaluation need to be tested to
@@ -13083,11 +13085,12 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
/* /*
* The result is used as the new evaluation locset. * The result is used as the new evaluation locset.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
xptr_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */
@@ -13108,6 +13111,8 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
oldset = obj->nodesetval; oldset = obj->nodesetval;
oldnode = ctxt->context->node; oldnode = ctxt->context->node;
oldDoc = ctxt->context->doc; oldDoc = ctxt->context->doc;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
/* /*
* Initialize the new set. * Initialize the new set.
@@ -13142,9 +13147,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeNodeSet(newset); xmlXPathFreeNodeSet(newset);
xmlXPathFreeObject(obj); goto error;
ctxt->context->node = oldnode;
return(0);
} }
/* /*
* The result of the evaluation needs to be tested to * The result of the evaluation needs to be tested to
@@ -13185,12 +13188,13 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, newset));
error:
xmlXPathReleaseObject(ctxt->context, obj); xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->doc = oldDoc; ctxt->context->doc = oldDoc;
valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, newset)); ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
} }
return(total); return(total);
} }
@@ -13211,8 +13215,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
int equal, ret; int equal, ret;
xmlXPathCompExprPtr comp; xmlXPathCompExprPtr comp;
xmlXPathObjectPtr arg1, arg2; xmlXPathObjectPtr arg1, arg2;
int pp;
int cs;
CHECK_ERROR0; CHECK_ERROR0;
comp = ctxt->comp; comp = ctxt->comp;
@@ -13220,16 +13222,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
case XPATH_OP_END: case XPATH_OP_END:
return (0); return (0);
case XPATH_OP_AND: case XPATH_OP_AND:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
if ((ctxt->value == NULL) || (ctxt->value->boolval == 0)) if ((ctxt->value == NULL) || (ctxt->value->boolval == 0))
return (total); return (total);
arg2 = valuePop(ctxt); arg2 = valuePop(ctxt);
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
@@ -13242,16 +13240,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
return (total); return (total);
case XPATH_OP_OR: case XPATH_OP_OR:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
if ((ctxt->value == NULL) || (ctxt->value->boolval == 1)) if ((ctxt->value == NULL) || (ctxt->value->boolval == 1))
return (total); return (total);
arg2 = valuePop(ctxt); arg2 = valuePop(ctxt);
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
@@ -13264,12 +13258,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
return (total); return (total);
case XPATH_OP_EQUAL: case XPATH_OP_EQUAL:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->value) if (op->value)
@@ -13279,25 +13269,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, equal)); valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, equal));
return (total); return (total);
case XPATH_OP_CMP: case XPATH_OP_CMP:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
ret = xmlXPathCompareValues(ctxt, op->value, op->value2); ret = xmlXPathCompareValues(ctxt, op->value, op->value2);
valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret)); valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret));
return (total); return (total);
case XPATH_OP_PLUS: case XPATH_OP_PLUS:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->ch2 != -1) { if (op->ch2 != -1) {
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
} }
CHECK_ERROR0; CHECK_ERROR0;
@@ -13313,12 +13295,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
} }
return (total); return (total);
case XPATH_OP_MULT: case XPATH_OP_MULT:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->value == 0) if (op->value == 0)
@@ -13329,12 +13307,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathModValues(ctxt); xmlXPathModValues(ctxt);
return (total); return (total);
case XPATH_OP_UNION: case XPATH_OP_UNION:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
@@ -13489,18 +13463,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
return (total); return (total);
} }
case XPATH_OP_ARG: case XPATH_OP_ARG:
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
if (op->ch1 != -1) { if (op->ch1 != -1) {
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
ctxt->context->contextSize = cs;
ctxt->context->proximityPosition = pp;
CHECK_ERROR0; CHECK_ERROR0;
} }
if (op->ch2 != -1) { if (op->ch2 != -1) {
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
ctxt->context->contextSize = cs;
ctxt->context->proximityPosition = pp;
CHECK_ERROR0; CHECK_ERROR0;
} }
return (total); return (total);
@@ -13512,6 +13480,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode; xmlNodePtr oldnode;
xmlDocPtr oldDoc; xmlDocPtr oldDoc;
int oldcs, oldpp;
int i; int i;
/* /*
@@ -13636,6 +13605,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldlocset = obj->user; oldlocset = obj->user;
oldnode = ctxt->context->node; oldnode = ctxt->context->node;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
@@ -13656,9 +13627,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
ctxt->context->node = oldnode; goto filter_xptr_error;
return(0);
} }
/* /*
@@ -13687,11 +13657,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
/* /*
* The result is used as the new evaluation locset. * The result is used as the new evaluation locset.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
filter_xptr_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */
@@ -13709,6 +13680,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
oldset = obj->nodesetval; oldset = obj->nodesetval;
oldnode = ctxt->context->node; oldnode = ctxt->context->node;
oldDoc = ctxt->context->doc; oldDoc = ctxt->context->doc;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
tmp = NULL; tmp = NULL;
/* /*
* Initialize the new set. * Initialize the new set.
@@ -13774,9 +13747,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeNodeSet(newset); xmlXPathFreeNodeSet(newset);
xmlXPathFreeObject(obj); goto filter_error;
ctxt->context->node = oldnode;
return(0);
} }
/* /*
@@ -13816,13 +13787,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
ctxt->context->node = oldnode;
ctxt->context->doc = oldDoc;
valuePush(ctxt, valuePush(ctxt,
xmlXPathCacheWrapNodeSet(ctxt->context, newset)); xmlXPathCacheWrapNodeSet(ctxt->context, newset));
filter_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode;
ctxt->context->doc = oldDoc;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
} }
return (total); return (total);
} }
@@ -13847,6 +13819,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlLocationSetPtr oldlocset; xmlLocationSetPtr oldlocset;
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode = ctxt->context->node; xmlNodePtr oldnode = ctxt->context->node;
int oldcs = ctxt->context->contextSize;
int oldpp = ctxt->context->proximityPosition;
int i, j; int i, j;
if (op->ch1 != -1) { if (op->ch1 != -1) {
@@ -13894,9 +13868,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
ctxt->context->node = oldnode; goto rangeto_error;
return(0);
} }
res = valuePop(ctxt); res = valuePop(ctxt);
@@ -13958,9 +13931,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
ctxt->context->node = oldnode; goto rangeto_error;
return(0);
} }
res = valuePop(ctxt); res = valuePop(ctxt);
@@ -13988,11 +13960,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
rangeto_error:
xmlXPathReleaseObject(ctxt->context, obj); xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->contextSize = -1; ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = -1; ctxt->context->proximityPosition = oldpp;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */