[pkg-java] r11632 - in trunk/fop/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2010-02-18 21:35:41 +0000 (Thu, 18 Feb 2010)
New Revision: 11632

Added:
   trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch
Modified:
   trunk/fop/debian/changelog
Log:
[fop] (hopefully) Fix a nasty segfault on docbook anchors

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2010-02-18 20:22:37 UTC (rev 11631)
+++ trunk/fop/debian/changelog	2010-02-18 21:35:41 UTC (rev 11632)
@@ -1,3 +1,11 @@
+fop (1:0.95.dfsg-8) experimental; urgency=low
+
+  * Added 02_fix_segfault_with_anchors, patch courtesy of Brian M. Carlson
+    <sandals at crustytoothpaste.ath.cx> to stop fop from choking on
+    anchors. (closes: #570095)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 18 Feb 2010 22:27:52 +0100
+
 fop (1:0.95.dfsg-7) unstable; urgency=low
 
   * Change of my email address since I am DD

Added: trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch
===================================================================
--- trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch	                        (rev 0)
+++ trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch	2010-02-18 21:35:41 UTC (rev 11632)
@@ -0,0 +1,15 @@
+diff -ur fop.old/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
+--- fop.old/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2010-02-17 20:56:53.000000000 +0000
++++ fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2010-02-17 21:00:00.000000000 +0000
+@@ -331,6 +331,11 @@
+         while (oldListIterator.hasNext()) {
+             oldElement = (KnuthElement) oldListIterator.next();
+             currLM = (InlineLevelLayoutManager) oldElement.getLayoutManager();
++            // This can occur if a fo:inline element is empty but has an id
++            // attribute on it.  Punt in that case.
++            if (currLM == null) {
++            	continue;
++            }
+             // initialize prevLM
+             if (prevLM == null) {
+                 prevLM = currLM;