bug 60484: avoid NPE

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

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
index ab230580a1d3b7252065f583c36c01d348ce7d01..7eb3af2834fdd364a09deaae5ef6e69c45b05cfc 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
@@ -421,8 +421,11 @@ public final class Picture
 
         if ( escherRecord instanceof EscherBSERecord )
         {
-            return ( (EscherBSERecord) escherRecord ).getBlipRecord()
-                    .getPicturedata();
+            EscherBlipRecord blip = ( (EscherBSERecord) escherRecord ).getBlipRecord();
+            if (blip != null) {
+                return blip.getPicturedata();
+            
+            }
         }
         return new byte[0];
     }