commit 0c3aa44d367586925d32e640891d5cca87b7f03d
author PJ Fanning <fanningpj@apache.org> Fri Apr 09 08:21:13 2021 +0000
committer PJ Fanning <fanningpj@apache.org> Fri Apr 09 08:21:13 2021 +0000
tree 9f0e2d08f4dcce53546031d30b24df6194277c16
parent 30d8d1773596008d8333c282e420f19d8215d44a

[bug-65227] add NPE guard in SheetUtil. Thanks to Petr Blaha

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

poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java

diff --git a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
index 06d3aa1..5033e8e 100644
--- a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
@@ -160,18 +160,20 @@
         double width = -1;
         if (cellType == CellType.STRING) {
             RichTextString rt = cell.getRichStringCellValue();
-            String[] lines = rt.getString().split("\\n");
-            for (String line : lines) {
-                String txt = line + defaultChar;
+            if (rt != null && rt.getString() != null) {
+                String[] lines = rt.getString().split("\\n");
+                for (String line : lines) {
+                    String txt = line + defaultChar;
 
-                AttributedString str = new AttributedString(txt);
-                copyAttributes(font, str, 0, txt.length());
+                    AttributedString str = new AttributedString(txt);
+                    copyAttributes(font, str, 0, txt.length());
 
-                /*if (rt.numFormattingRuns() > 0) {
-                    // TODO: support rich text fragments
-                }*/
+                    /*if (rt.numFormattingRuns() > 0) {
+                        // TODO: support rich text fragments
+                    }*/
 
-                width = getCellWidth(defaultCharWidth, colspan, style, width, str);
+                    width = getCellWidth(defaultCharWidth, colspan, style, width, str);
+                }
             }
         } else {
             String sval = null;