From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 12 Oct 2021 13:51:54 +0000 (+0000)
Subject: FOP-2943: NPE when inline character is a white space
X-Git-Tag: fop-2_7~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8f16c486a5cced199c2728edb6712f3aa3838db;p=xmlgraphics-fop.git

FOP-2943: NPE when inline character is a white space
Thanks to J Frank

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1894164 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/fop-core/src/main/java/org/apache/fop/fo/FObj.java b/fop-core/src/main/java/org/apache/fop/fo/FObj.java
index d938eded0..0f6acb871 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/FObj.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/FObj.java
@@ -314,7 +314,7 @@ public abstract class FObj extends FONode implements Constants {
         }
         if (child == lastChild) {
             if (child.siblings != null) {
-                lastChild = siblings[0];
+                lastChild = child.siblings[0];
             } else {
                 lastChild = null;
             }
diff --git a/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml b/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
new file mode 100644
index 000000000..e39ec09a8
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>This test checks empty character inside inline.</p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"
+                               margin="0.5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block><fo:inline>block1</fo:inline><fo:character character=" "/></fo:block>
+          <fo:block><fo:inline>block2</fo:inline><fo:character character="2"/></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="block1" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/word[1]" />
+    <eval expected="block2" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/word[1]" />
+    <eval expected="" xpath="//flow/block[2]/lineArea[1]/text[1]/space[1]" />
+    <eval expected="2" xpath="//flow/block[2]/lineArea[1]/text[1]" />
+  </checks>
+</testcase>