Changeset 42884 in vbox for trunk/src/libs

Timestamp:

Aug 20, 2012 1:35:06 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80169

Message:

libxml: patch from upstream

Location:

trunk/src/libs/libxml2-2.6.31

Files:

• include/libxml/xpath.h (modified) (2 diffs)
• xpath.c (modified) (11 diffs)
• xpointer.c (modified) (1 diff)

trunk/src/libs/libxml2-2.6.31/include/libxml/xpath.h

@@ -69 +69 @@
     XPATH_ENCODING_ERROR,
     XPATH_INVALID_CHAR_ERROR,
-    XPATH_INVALID_CTXT
+    XPATH_INVALID_CTXT,
+    XPATH_STACK_ERROR
 } xmlXPathError;
 
@@ -378 +379 @@
     int xptr;                           /* it this an XPointer expression */
     xmlNodePtr         ancestor;        /* used for walking preceding axis */
+
+    int              valueFrame;        /* used to limit Pop on the stack */
 };
 

trunk/src/libs/libxml2-2.6.31/xpath.c

@@ -253 +253 @@
     "Char out of XML range\n",
     "Invalid or incomplete context\n",
+    "Stack usage errror\n",
     "?? Unknown error ??\n"     /* Must be last in the list! */
 };
@@ -2399 +2400 @@
 
 /**
+ * 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
@@ -2413 +2450 @@
     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)
@@ -6137 +6180 @@
     ret->valueMax = 10;
     ret->value = NULL;
+    ret->valueFrame = 0;
 
     ret->context = ctxt;
@@ -11674 +11718 @@
         xmlNodePtr oldContextNode, contextNode = NULL;
         xmlXPathContextPtr xpctxt = ctxt->context;
+        int frame;
 
 #ifdef LIBXML_XPTR_ENABLED
@@ -11693 +11738 @@
         exprOp = &ctxt->comp->steps[op->ch2];
         for (i = 0; i < set->nodeNr; i++) {
+            xmlXPathObjectPtr tmp;
+
             if (set->nodeTab[i] == NULL)
                 continue;
@@ -11720 +11767 @@
                     contextNode);
 
+            frame = xmlXPathSetFrame(ctxt);
             valuePush(ctxt, contextObj);
             res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
-            
+            tmp = valuePop(ctxt);
+            xmlXPathPopFrame(ctxt, frame);
+
             if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
-                xmlXPathObjectPtr tmp;
-                /* pop the result */
-                tmp = valuePop(ctxt);
-                xmlXPathReleaseObject(xpctxt, tmp);
-                /* then pop off contextObj, which will be freed later */
-                valuePop(ctxt);
+                while (tmp != contextObj) {
+                    /*
+                     * Free up the result
+                     * then pop off contextObj, which will be freed later
+                     */
+                    xmlXPathReleaseObject(xpctxt, tmp);
+                    tmp = valuePop(ctxt);
+                }
                 goto evaluation_error;
             }
+            /* push the result back onto the stack */
+            valuePush(ctxt, tmp);
 
             if (res)
@@ -13335 +13389 @@
                 const xmlChar *oldFunc, *oldFuncURI;
                 int i;
-
+                int frame;
+
+                frame = xmlXPathSetFrame(ctxt);
                 if (op->ch1 != -1)
                     total +=
@@ -13343 +13399 @@
                             "xmlXPathCompOpEval: parameter error\n");
                     ctxt->error = XPATH_INVALID_OPERAND;
+                    xmlXPathPopFrame(ctxt, frame);
                     return (total);
                 }
-                for (i = 0; i < op->value; i++)
+                for (i = 0; i < op->value; i++) {
                     if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
                         xmlGenericError(xmlGenericErrorContext,
                                 "xmlXPathCompOpEval: parameter error\n");
                         ctxt->error = XPATH_INVALID_OPERAND;
+                        xmlXPathPopFrame(ctxt, frame);
                         return (total);
                     }
+                }
                 if (op->cache != NULL)
                     XML_CAST_FPTR(func) = op->cache;
@@ -13389 +13448 @@
                 ctxt->context->function = oldFunc;
                 ctxt->context->functionURI = oldFuncURI;
+                xmlXPathPopFrame(ctxt, frame);
                 return (total);
             }
@@ -14293 +14353 @@
         ctxt->valueMax = 10;
         ctxt->value = NULL;
+        ctxt->valueFrame = 0;
     }
 #ifdef XPATH_STREAMING

trunk/src/libs/libxml2-2.6.31/xpointer.c

@@ -1261 +1261 @@
         ctxt->valueMax = 10;
         ctxt->value = NULL;
+        ctxt->valueFrame = 0;
     }
     SKIP_BLANKS;