Author: onealj
Date: Tue Jan 3 04:35:54 2017
New Revision: 1777063
URL: http://svn.apache.org/viewvc?rev=1777063&view=rev
Log:
bug 60484: avoid NPE
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java?rev=1777063&r1=1777062&r2=1777063&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java Tue
Jan 3 04:35:54 2017
@@ -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];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
