From 0c3aa44d367586925d32e640891d5cca87b7f03d Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 9 Apr 2021 08:21:13 +0000 Subject: [PATCH] [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 --- .../org/apache/poi/ss/util/SheetUtil.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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 06d3aa1f70..5033e8ec85 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 @@ public class SheetUtil { 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;