From: Tim Allison <tallison@apache.org>
Date: Fri, 27 Sep 2013 19:35:14 +0000 (+0000)
Subject: Potential NPE in PPExtractor; found while working on TIKA-1171
X-Git-Tag: REL_3_10_FINAL~106
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=49fc2a7a1cca62661bfcd231cc6d8662a9f70364;p=poi.git

Potential NPE in PPExtractor; found while working on TIKA-1171

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
index f416d63907..d96e2243d1 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
@@ -231,9 +231,11 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
                             }
                             TextShape tsh = (TextShape)sh;
                             String text = tsh.getText();
-                            ret.append(text);
-                            if (!text.endsWith("\n")) {
-                                ret.append("\n");
+                            if (text != null){
+                                ret.append(text);
+                                if (!text.endsWith("\n")) {
+                                    ret.append("\n");
+                                }
                             }
                         }
                     }