8370632: Additional libxslt 1.1.43 fixes

Reviewed-by: kcr, jbhaskar

Author: Hima Bindu Meda

modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/transform.c

@@ -518,19 +518,20 @@ xsltTransformCacheFree(xsltTransformCachePtr cache)
     /*
     * Free tree fragments.
     */
-    if (cache->RVT) {
-    xmlDocPtr tmp, cur = cache->RVT;
+    if (cache->rvtList) {
+        xsltRVTListPtr tmp, cur = cache->rvtList;
     while (cur) {
         tmp = cur;
-        cur = (xmlDocPtr) cur->next;
-        if (tmp->_private != NULL) {
+            cur = cur->next;
+            if (tmp->RVT->_private != NULL) {
         /*
-        * Tree the document info.
+                * Free the document info.
         */
-        xsltFreeDocumentKeys((xsltDocumentPtr) tmp->_private);
-        xmlFree(tmp->_private);
+                xsltFreeDocumentKeys((xsltDocumentPtr) tmp->RVT->_private);
+                xmlFree(tmp->RVT->_private);
         }
-        xmlFreeDoc(tmp);
+            xmlFreeDoc(tmp->RVT);
+            xmlFree(tmp);
     }
     }
     /*
@@ -2263,38 +2264,36 @@ xsltLocalVariablePush(xsltTransformContextPtr ctxt,
  * are preserved; all other fragments are freed/cached.
  */
 static void
-xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xmlDocPtr base)
+xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xsltRVTListPtr base)
 {
-    xmlDocPtr cur = ctxt->localRVT, tmp;
+    xsltRVTListPtr cur = ctxt->localRVTList, tmp;
 
     if (cur == base)
         return;
-    if (cur->prev != NULL)
-        xsltTransformError(ctxt, NULL, NULL, "localRVT not head of list\n");
 
-    /* Reset localRVT early because some RVTs might be registered again. */
-    ctxt->localRVT = base;
-    if (base != NULL)
-        base->prev = NULL;
+    /* Reset localRVTList early because some RVTs might be registered again. */
+    ctxt->localRVTList = base;
 
     do {
         tmp = cur;
-        cur = (xmlDocPtr) cur->next;
-        if (tmp->compression == XSLT_RVT_LOCAL) {
-            xsltReleaseRVT(ctxt, tmp);
-        } else if (tmp->compression == XSLT_RVT_GLOBAL) {
-            xsltRegisterPersistRVT(ctxt, tmp);
-        } else if (tmp->compression == XSLT_RVT_FUNC_RESULT) {
+        cur = cur->next;
+        if (tmp->RVT->compression == XSLT_RVT_LOCAL) {
+            xsltReleaseRVTList(ctxt, tmp);
+        } else if (tmp->RVT->compression == XSLT_RVT_GLOBAL) {
+            xsltRegisterPersistRVT(ctxt, tmp->RVT);
+            xmlFree(tmp);
+        } else if (tmp->RVT->compression == XSLT_RVT_FUNC_RESULT) {
             /*
              * This will either register the RVT again or move it to the
              * context variable.
              */
-            xsltRegisterLocalRVT(ctxt, tmp);
-            tmp->compression = XSLT_RVT_FUNC_RESULT;
+            xsltRegisterLocalRVT(ctxt, tmp->RVT);
+            tmp->RVT->compression = XSLT_RVT_FUNC_RESULT;
+            xmlFree(tmp);
         } else {
             xmlGenericError(xmlGenericErrorContext,
-                    "xsltReleaseLocalRVTs: Unexpected RVT flag %p\n",
-                    tmp->psvi);
+                    "xsltReleaseLocalRVTs: Unexpected RVT flag %d\n",
+                    tmp->RVT->compression);
         }
     } while (cur != base);
 }
@@ -2322,7 +2321,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
     xmlNodePtr oldInsert, oldInst, oldCurInst, oldContextNode;
     xmlNodePtr cur, insert, copy = NULL;
     int level = 0, oldVarsNr;
-    xmlDocPtr oldLocalFragmentTop;
+    xsltRVTListPtr oldLocalFragmentTop;
 
 #ifdef XSLT_REFACTORED
     xsltStylePreCompPtr info;
@@ -2368,7 +2367,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
     }
     ctxt->depth++;
 
-    oldLocalFragmentTop = ctxt->localRVT;
+    oldLocalFragmentTop = ctxt->localRVTList;
     oldInsert = insert = ctxt->insert;
     oldInst = oldCurInst = ctxt->inst;
     oldContextNode = ctxt->node;
@@ -2602,8 +2601,8 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
             /*
             * Cleanup temporary tree fragments.
             */
-            if (oldLocalFragmentTop != ctxt->localRVT)
-            xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+            if (oldLocalFragmentTop != ctxt->localRVTList)
+                xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
 
             ctxt->insert = oldInsert;
         } else if (info->type == XSLT_FUNC_VARIABLE) {
@@ -2697,8 +2696,8 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
             /*
             * Cleanup temporary tree fragments.
             */
-            if (oldLocalFragmentTop != ctxt->localRVT)
-            xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+            if (oldLocalFragmentTop != ctxt->localRVTList)
+                xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
 
             ctxt->insert = oldInsert;
         }
@@ -2763,7 +2762,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
         /*
         * Cleanup temporary tree fragments.
         */
-        if (oldLocalFragmentTop != ctxt->localRVT)
+        if (oldLocalFragmentTop != ctxt->localRVTList)
             xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
 
                 ctxt->insert = oldInsert;
@@ -2893,7 +2892,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
         /*
         * Cleanup temporary tree fragments.
         */
-        if (oldLocalFragmentTop != ctxt->localRVT)
+        if (oldLocalFragmentTop != ctxt->localRVTList)
             xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
 
                 ctxt->insert = oldInsert;
@@ -3072,7 +3071,7 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
     int oldVarsBase = 0;
     xmlNodePtr cur;
     xsltStackElemPtr tmpParam = NULL;
-    xmlDocPtr oldUserFragmentTop;
+    xsltRVTListPtr oldUserFragmentTop;
 #ifdef WITH_PROFILER
     long start = 0;
 #endif
@@ -3120,8 +3119,8 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
         return;
     }
 
-    oldUserFragmentTop = ctxt->tmpRVT;
-    ctxt->tmpRVT = NULL;
+    oldUserFragmentTop = ctxt->tmpRVTList;
+    ctxt->tmpRVTList = NULL;
 
     /*
     * Initiate a distinct scope of local params/variables.
@@ -3232,16 +3231,16 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
     * user code should now use xsltRegisterLocalRVT() instead
     * of the obsolete xsltRegisterTmpRVT().
     */
-    if (ctxt->tmpRVT) {
-    xmlDocPtr curdoc = ctxt->tmpRVT, tmp;
+    if (ctxt->tmpRVTList) {
+        xsltRVTListPtr curRVTList = ctxt->tmpRVTList, tmp;
 
-    while (curdoc != NULL) {
-        tmp = curdoc;
-        curdoc = (xmlDocPtr) curdoc->next;
-        xsltReleaseRVT(ctxt, tmp);
+        while (curRVTList != NULL) {
+            tmp = curRVTList;
+            curRVTList = curRVTList->next;
+            xsltReleaseRVTList(ctxt, tmp);
     }
     }
-    ctxt->tmpRVT = oldUserFragmentTop;
+    ctxt->tmpRVTList = oldUserFragmentTop;
 
     /*
     * Pop the xsl:template declaration from the stack.
@@ -5319,15 +5318,15 @@ xsltIf(xsltTransformContextPtr ctxt, xmlNodePtr contextNode,
 
 #ifdef XSLT_FAST_IF
     {
-    xmlDocPtr oldLocalFragmentTop = ctxt->localRVT;
+        xsltRVTListPtr oldLocalFragmentTop = ctxt->localRVTList;
 
     res = xsltPreCompEvalToBoolean(ctxt, contextNode, comp);
 
     /*
     * Cleanup fragments created during evaluation of the
     * "select" expression.
     */
-    if (oldLocalFragmentTop != ctxt->localRVT)
+    if (oldLocalFragmentTop != ctxt->localRVTList)
         xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
     }