Permalink
Browse files

Fix a potential freeing error in XPath

  • Loading branch information...
1 parent ae87421 commit df83c17e5a2646bd923f75e5e507bc80d73c9722 @veillard veillard committed Nov 17, 2010
Showing with 8 additions and 4 deletions.
  1. +8 −4 xpath.c
View
12 xpath.c
@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
xmlXPathObjectPtr tmp;
- /* pop the result */
+ /* pop the result if any */
tmp = valuePop(ctxt);
- xmlXPathReleaseObject(xpctxt, tmp);
- /* then pop off contextObj, which will be freed later */
- valuePop(ctxt);
+ if (tmp != contextObj)
+ /*
+ * Free up the result
+ * then pop off contextObj, which will be freed later
+ */
+ xmlXPathReleaseObject(xpctxt, tmp);
+ valuePop(ctxt);
goto evaluation_error;
}

0 comments on commit df83c17

Please sign in to comment.