From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 12 Dec 2022 21:09:09 +0000 (+0000)
Subject: [bug-66319] do not create HSSF patriarch to find comments (only use one that pre... 
X-Git-Tag: REL_5_2_4~348
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=693c59574ce6ae074823d5a753c582c71426ed37;p=poi.git

[bug-66319] do not create HSSF patriarch to find comments (only use one that pre-exists)

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

diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index c8e3c9bad3..f50e18edb9 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -2527,10 +2527,7 @@ public final class HSSFSheet implements Sheet {
 
     protected HSSFComment findCellComment(int row, int column) {
         HSSFPatriarch patriarch = getDrawingPatriarch();
-        if (null == patriarch) {
-            patriarch = createDrawingPatriarch();
-        }
-        return lookForComment(patriarch, row, column);
+        return patriarch == null ? null : lookForComment(patriarch, row, column);
     }
 
     private HSSFComment lookForComment(HSSFShapeContainer container, int row, int column) {
diff --git a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
index c9cc7c748a..b29c4bc3ee 100644
--- a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -2609,4 +2609,38 @@ final class TestBugs extends BaseTestBugzillaIssues {
             assertNotNull(wb);
         }
     }
+
+    @Test
+    void test66319() throws IOException {
+        try (
+                HSSFWorkbook workbook = openSampleWorkbook("bug66319.xls");
+                UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream()
+        ) {
+            for (Sheet sheet : workbook) {
+                for (Row row : sheet) {
+                    for (Cell cell : row) {
+                        cell.getCellComment();
+                    }
+                }
+            }
+            workbook.write(bos);
+        }
+    }
+
+    @Test
+    void test66319WithRemove() throws IOException {
+        try (
+                HSSFWorkbook workbook = openSampleWorkbook("bug66319.xls");
+                UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream()
+        ) {
+            for (Sheet sheet : workbook) {
+                for (Row row : sheet) {
+                    for (Cell cell : row) {
+                        cell.removeCellComment();
+                    }
+                }
+            }
+            workbook.write(bos);
+        }
+    }
 }
diff --git a/test-data/spreadsheet/bug66319.xls b/test-data/spreadsheet/bug66319.xls
new file mode 100644
index 0000000000..163ce16e7d
Binary files /dev/null and b/test-data/spreadsheet/bug66319.xls differ