From: Dominik Stadler <centic@apache.org>
Date: Wed, 13 Jan 2016 19:45:49 +0000 (+0000)
Subject: Fix a NullPointerException that occurs with some PPTs now but did not in POI 3.13
X-Git-Tag: REL_3_14_FINAL~78
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc5f2700a3009d020f1149d15866f02b3f274f15;p=poi.git

Fix a NullPointerException that occurs with some PPTs now but did not in POI 3.13

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
index ceb4853e30..5a050f5e13 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
@@ -600,8 +600,15 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         boolean hasColor = getFlag(ParagraphFlagsTextProp.BULLET_HARDCOLOR_IDX);
         if (tp == null || !hasColor) {
             // if bullet color is undefined, return color of first run
-            if (_runs.isEmpty()) return null;
+            if (_runs.isEmpty()) {
+                return null;
+            }
+            
             SolidPaint sp = _runs.get(0).getFontColor();
+            if(sp == null) {
+                return null;
+            }
+            
             return DrawPaint.applyColorTransform(sp.getSolidColor());
         }
 
diff --git a/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt b/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt
new file mode 100755
index 0000000000..ead1b49277
Binary files /dev/null and b/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt differ