(2020/07/15) POI: [bug-64600] Avoid XWPF NPE when styleid is null. Th…

…anks to Sayi. This closes nissl-lab#186 https://svn.apache.org/viewvc?view=revision&revision=1879859
9rnsr · Mar 16, 2023 · d3043cc · d3043cc
1 parent fe975de
commit d3043cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/ooxml/XWPF/Usermodel/XWPFStyles.cs b/ooxml/XWPF/Usermodel/XWPFStyles.cs
@@ -172,13 +172,9 @@ public void SetStyles(CT_Styles styles)
          */
         public bool StyleExist(String styleID)
         {
-            foreach (XWPFStyle style in listStyle)
-            {
-                if (style.StyleId.Equals(styleID))
-                    return true;
-            }
-            return false;
+            return null != GetStyle(styleID);
         }
+
         /**
          * add a style to the document
          * @param style				
@@ -191,6 +187,7 @@ public void AddStyle(XWPFStyle style)
             int pos = (ctStyles.GetStyleList().Count) - 1;
             ctStyles.SetStyleArray(pos, style.GetCTStyle());
         }
+
         /**
          *get style by a styleID 
          * @param styleID	styleID of the searched style
@@ -200,15 +197,8 @@ public XWPFStyle GetStyle(String styleID)
         {
             foreach (XWPFStyle style in listStyle)
             {
-                try
-                {
-                    if (style.StyleId.Equals(styleID))
-                        return style;
-                }
-                catch (NullReferenceException e)
-                {
-                    // Ignore NPE
-                }
+                if (style.StyleId?.Equals(styleID) ?? false)
+                    return style;
             }
             return null;
         }

diff --git a/testcases/ooxml/XWPF/UserModel/TestXWPFStyles.cs b/testcases/ooxml/XWPF/UserModel/TestXWPFStyles.cs
@@ -223,6 +223,11 @@ public void TestMissingStyleId()
                 Assert.IsNotNull(styles.GetStyle("NoList"));
                 Assert.IsNull(styles.GetStyle("EmptyCellLayoutStyle"));
                 Assert.IsNotNull(styles.GetStyle("BalloonText"));
+
+                // Bug 64600: styleExist throws NPE
+                Assert.IsTrue(styles.StyleExist("NoList"));
+                Assert.IsFalse(styles.StyleExist("EmptyCellLayoutStyle"));
+                Assert.IsTrue(styles.StyleExist("BalloonText"));
             }
             catch (NullReferenceException e)
             {