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

[Mike Hommey]

Author: glandium
Date: 2006-12-04 16:56:22 +0100 (Mon, 04 Dec 2006)
New Revision: 612

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/libxslt/transform.c
Log:
 r1216 at namakemono:  mh | 2006-12-04 16:38:55 +0100
 * libxslt/transform.c: Patch from upstream CVS to fix hangs and segfaults
   when processing XCB protocol definitions. Closes: #398327, again.



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

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-11-30 19:15:15 UTC (rev 611)
+++ packages/libxslt/trunk/debian/changelog	2006-12-04 15:56:22 UTC (rev 612)
@@ -2,8 +2,10 @@
 
   * New upstream release
   * debian/rules: Set shlibs version to >= 1.1.18.
+  * libxslt/transform.c: Patch from upstream CVS to fix hangs and segfaults
+    when processing XCB protocol definitions. Closes: #398327, again.
 
- -- Mike Hommey <glandium at debian.org>  Thu, 30 Nov 2006 08:44:45 +0100
+ -- Mike Hommey <glandium at debian.org>  Fri,  1 Dec 2006 19:13:58 +0100
 
 libxslt (1.1.18-3) unstable; urgency=low
 

Modified: packages/libxslt/trunk/libxslt/transform.c
===================================================================
--- packages/libxslt/trunk/libxslt/transform.c	2006-11-30 19:15:15 UTC (rev 611)
+++ packages/libxslt/trunk/libxslt/transform.c	2006-12-04 15:56:22 UTC (rev 612)
@@ -2118,14 +2118,14 @@
 	    cur = (xmlDocPtr) cur->next;
 
 	    if (tmp == ctxt->localRVT)
-		ctxt->localRVT = (xmlDocPtr) tmp->next;
+		ctxt->localRVT = cur;
 
 	    /*
 	    * We need ctxt->localRVTBase for extension instructions
 	    * which return values (like EXSLT's function).
 	    */
 	    if (tmp == ctxt->localRVTBase)
-		ctxt->localRVTBase = (xmlDocPtr) tmp->next;
+		ctxt->localRVTBase = cur;
 
 	    if (tmp->prev)
 		tmp->prev->next = (xmlNodePtr) cur;
@@ -3032,6 +3032,9 @@
 	do {
 	    tmp = curdoc;
 	    curdoc = (xmlDocPtr) curdoc->next;
+	    /* Need to housekeep localRVTBase */
+	    if (tmp == ctxt->localRVTBase)
+	        ctxt->localRVTBase = curdoc;
 	    xsltReleaseRVT(ctxt, tmp);
 	} while (curdoc != oldLocalFragmentTop);
     }