From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 17 Dec 2018 09:17:29 +0000 (+0000)
Subject: add null check in XLSFPictureShape
X-Git-Tag: REL_4_1_0~181
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb7ffebe0fed98a4376a937277ed1d0e59f21522;p=poi.git

add null check in XLSFPictureShape

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

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
index 01f903e193..ed11a6b197 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
@@ -265,28 +265,28 @@ public class XSLFPictureShape extends XSLFSimpleShape
 
     public XSLFPictureData getSvgImage() {
         CTBlip blip = getBlip();
-        CTOfficeArtExtensionList extLst = blip.getExtLst();
-        if (extLst == null) {
-            return null;
-        }
+        if (blip != null) {
+            CTOfficeArtExtensionList extLst = blip.getExtLst();
+            if (extLst == null) {
+                return null;
+            }
 
-        int size = extLst.sizeOfExtArray();
-        for (int i=0; i<size; i++) {
-            XmlCursor cur = extLst.getExtArray(i).newCursor();
-            try {
-                if (cur.toChild(SVG_NS, "svgBlip")) {
-                    String svgRelId = cur.getAttributeText(new QName(CORE_PROPERTIES_ECMA376_NS, "embed"));
-                    return (svgRelId != null) ? (XSLFPictureData)getSheet().getRelationById(svgRelId) : null;
+            int size = extLst.sizeOfExtArray();
+            for (int i = 0; i < size; i++) {
+                XmlCursor cur = extLst.getExtArray(i).newCursor();
+                try {
+                    if (cur.toChild(SVG_NS, "svgBlip")) {
+                        String svgRelId = cur.getAttributeText(new QName(CORE_PROPERTIES_ECMA376_NS, "embed"));
+                        return (svgRelId != null) ? (XSLFPictureData) getSheet().getRelationById(svgRelId) : null;
+                    }
+                } finally {
+                    cur.dispose();
                 }
-            } finally {
-                cur.dispose();
             }
         }
-
         return null;
     }
 
-
     /**
      * Convienence method for adding SVG images, which generates the preview image
      * @param sheet the sheet to add