[xml/sgml-commit] r605 - in packages/libxslt: . trunk/debian trunk/libxslt

[Mike Hommey]

Author: glandium
Date: 2006-11-21 08:03:27 +0100 (Tue, 21 Nov 2006)
New Revision: 605

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/libxslt/transform.c
Log:
 r1168 at namakemono:  mh | 2006-11-21 00:47:11 +0100
 * libxslt/transform.c:
   + Don't lose context namespaces in some recursive cases. Closes: #399010
   + Took patch from upstream CVS for copy-of issue with entities.
     Closes: #397395



Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1161
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1168

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-10-28 10:48:07 UTC (rev 604)
+++ packages/libxslt/trunk/debian/changelog	2006-11-21 07:03:27 UTC (rev 605)
@@ -1,3 +1,13 @@
+libxslt (1.1.18-2) unstable; urgency=high
+
+  * libxslt/transform.c:
+    + Don't lose context namespaces in some recursive cases. Closes: #399010
+    + Took patch from upstream CVS for copy-of issue with entities.
+      Closes: #397395
+  * Set urgency to high since we fix RC regressions.
+
+ -- Mike Hommey <glandium at debian.org>  Tue, 21 Nov 2006 00:42:01 +0100
+
 libxslt (1.1.18-1) unstable; urgency=low
 
   * New upstream release:

Modified: packages/libxslt/trunk/libxslt/transform.c
===================================================================
--- packages/libxslt/trunk/libxslt/transform.c	2006-10-28 10:48:07 UTC (rev 604)
+++ packages/libxslt/trunk/libxslt/transform.c	2006-11-21 07:03:27 UTC (rev 605)
@@ -1074,8 +1074,12 @@
 	    } else
 		copyNs = NULL;
 	}
+	/*
+	 * If attribute has a value, we need to copy it (watching out
+	 * for possible entities)
+	 */
 	if (attr->children)
-	    value = xmlNodeListGetString(attr->doc, attr->children, 1);
+	    value = xmlNodeListGetString(attr->doc, attr->children, 0);
 	/*
 	* REVISIT: I think xmlNewDocProp() is the only attr function
 	* which does not eval if the attr is of type ID. This is good,
@@ -4634,11 +4638,12 @@
     xmlNodePtr cur, delNode = NULL, oldContextNode;    
     xmlNodeSetPtr list = NULL, oldList;
     xsltStackElemPtr withParams = NULL;
-    int oldXPProximityPosition, oldXPContextSize;
+    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
     const xmlChar *oldMode, *oldModeURI;
     xmlDocPtr oldXPDoc;
     xsltDocumentPtr oldDocInfo;
     xmlXPathContextPtr xpctxt;
+    xmlNsPtr oldXPNamespaces;
 
     if (comp == NULL) {
 	xsltTransformError(ctxt, NULL, inst,
@@ -4672,6 +4677,8 @@
     oldXPContextSize = xpctxt->contextSize;
     oldXPProximityPosition = xpctxt->proximityPosition;
     oldXPDoc = xpctxt->doc;
+    oldXPNsNr = xpctxt->nsNr;
+    oldXPNamespaces = xpctxt->namespaces;
 
     /*
     * Set up contexts.
@@ -4989,6 +4996,8 @@
     /*
     * Restore context states.
     */
+    xpctxt->nsNr = oldXPNsNr;
+    xpctxt->namespaces = oldXPNamespaces;
     xpctxt->doc = oldXPDoc;
     xpctxt->contextSize = oldXPContextSize;
     xpctxt->proximityPosition = oldXPProximityPosition;