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

[Mike Hommey]

Author: glandium
Date: 2006-11-27 08:25:15 +0100 (Mon, 27 Nov 2006)
New Revision: 607

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/libxslt/transform.c
   packages/libxslt/trunk/libxslt/variables.c
Log:
 r1206 at namakemono:  mh | 2006-11-27 08:04:44 +0100
 * libxslt/variables.c: Patch from upstream CVS to fix hangs and segfaults
   when processing XCB protocol definitions. Closes: #398327.
 * libxslt/transform.c: Added a missing * to the previous patch. No real
   problem posed by it missing, but since upstream applied the patch with
   it and it's cleaner...



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

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-11-21 07:03:37 UTC (rev 606)
+++ packages/libxslt/trunk/debian/changelog	2006-11-27 07:25:15 UTC (rev 607)
@@ -1,3 +1,13 @@
+libxslt (1.1.18-3) unstable; urgency=low
+
+  * libxslt/variables.c: Patch from upstream CVS to fix hangs and segfaults
+    when processing XCB protocol definitions. Closes: #398327.
+  * libxslt/transform.c: Added a missing * to the previous patch. No real
+    problem posed by it missing, but since upstream applied the patch with
+    it and it's cleaner...
+
+ -- Mike Hommey <glandium at debian.org>  Sat, 25 Nov 2006 10:32:24 +0100
+
 libxslt (1.1.18-2) unstable; urgency=high
 
   * libxslt/transform.c:

Modified: packages/libxslt/trunk/libxslt/transform.c
===================================================================
--- packages/libxslt/trunk/libxslt/transform.c	2006-11-21 07:03:37 UTC (rev 606)
+++ packages/libxslt/trunk/libxslt/transform.c	2006-11-27 07:25:15 UTC (rev 607)
@@ -4643,7 +4643,7 @@
     xmlDocPtr oldXPDoc;
     xsltDocumentPtr oldDocInfo;
     xmlXPathContextPtr xpctxt;
-    xmlNsPtr oldXPNamespaces;
+    xmlNsPtr *oldXPNamespaces;
 
     if (comp == NULL) {
 	xsltTransformError(ctxt, NULL, inst,

Modified: packages/libxslt/trunk/libxslt/variables.c
===================================================================
--- packages/libxslt/trunk/libxslt/variables.c	2006-11-21 07:03:37 UTC (rev 606)
+++ packages/libxslt/trunk/libxslt/variables.c	2006-11-27 07:25:15 UTC (rev 607)
@@ -75,7 +75,9 @@
     if (ctxt->cache->RVT) {
 	container = ctxt->cache->RVT;
 	ctxt->cache->RVT = (xmlDocPtr) container->next;
+	/* clear the internal pointers */
 	container->next = NULL;
+	container->prev = NULL;
 	if (ctxt->cache->nbRVT > 0)
 	    ctxt->cache->nbRVT--;
 #ifdef XSLT_DEBUG_PROFILE_CACHE