Author: centic
Date: Wed Sep 13 10:59:54 2023
New Revision: 1912281
URL: http://svn.apache.org/viewvc?rev=1912281&view=rev
Log:
Bug 66425: Avoid NullPointerExceptions found via poi-fuzz
We try to avoid throwing NullPointerException, but it was possible
to trigger one here
Added:
poi/trunk/test-data/spreadsheet/crash-274d6342e4842d61be0fb48eaadad6208ae767ae.xlsx
(with props)
poi/trunk/test-data/spreadsheet/crash-9bf3cd4bd6f50a8a9339d363c2c7af14b536865c.xlsx
(with props)
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
poi/trunk/test-data/spreadsheet/stress.xls
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java?rev=1912281&r1=1912280&r2=1912281&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
Wed Sep 13 10:59:54 2023
@@ -90,8 +90,9 @@ public class XSSFChartSheet extends XSSF
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(
new QName(CTChartsheet.type.getName().getNamespaceURI(),
"chartsheet"));
- chartsheet.save(out, xmlOptions);
-
+ if (chartsheet != null) {
+ chartsheet.save(out, xmlOptions);
+ }
}
private static byte[] blankWorksheet(){
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java?rev=1912281&r1=1912280&r2=1912281&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
Wed Sep 13 10:59:54 2023
@@ -351,4 +351,12 @@ public final class TestWorkbookFactory {
return false;
}
}
+
+ @Test
+ void testEncryptionNullPointerException() throws IOException {
+ assertThrows(IllegalArgumentException.class,
+ () ->
WorkbookFactory.create(POIDataSamples.getSpreadSheetInstance().
+ openResourceAsStream(
+
"crash-9bf3cd4bd6f50a8a9339d363c2c7af14b536865c.xlsx")));
+ }
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java?rev=1912281&r1=1912280&r2=1912281&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
Wed Sep 13 10:59:54 2023
@@ -252,9 +252,15 @@ public final class CryptoFunctions {
if (cipherAlgorithm == CipherAlgorithm.rc4) {
cipher = Cipher.getInstance(cipherAlgorithm.jceId);
} else if (cipherAlgorithm.needsBouncyCastle) {
+ if (chain == null) {
+ throw new IllegalArgumentException("Did not have a chain
for cipher " + cipherAlgorithm);
+ }
registerBouncyCastle();
cipher = Cipher.getInstance(cipherAlgorithm.jceId + "/" +
chain.jceId + "/" + padding, "BC");
} else {
+ if (chain == null) {
+ throw new IllegalArgumentException("Did not have a chain
for cipher " + cipherAlgorithm);
+ }
cipher = Cipher.getInstance(cipherAlgorithm.jceId + "/" +
chain.jceId + "/" + padding);
}
Added:
poi/trunk/test-data/spreadsheet/crash-274d6342e4842d61be0fb48eaadad6208ae767ae.xlsx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/crash-274d6342e4842d61be0fb48eaadad6208ae767ae.xlsx?rev=1912281&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
poi/trunk/test-data/spreadsheet/crash-274d6342e4842d61be0fb48eaadad6208ae767ae.xlsx
------------------------------------------------------------------------------
--- svn:mime-type (added)
+++ svn:mime-type Wed Sep 13 10:59:54 2023
@@ -0,0 +1 @@
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
Added:
poi/trunk/test-data/spreadsheet/crash-9bf3cd4bd6f50a8a9339d363c2c7af14b536865c.xlsx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/crash-9bf3cd4bd6f50a8a9339d363c2c7af14b536865c.xlsx?rev=1912281&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
poi/trunk/test-data/spreadsheet/crash-9bf3cd4bd6f50a8a9339d363c2c7af14b536865c.xlsx
------------------------------------------------------------------------------
--- svn:mime-type (added)
+++ svn:mime-type Wed Sep 13 10:59:54 2023
@@ -0,0 +1 @@
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
Modified: poi/trunk/test-data/spreadsheet/stress.xls
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/stress.xls?rev=1912281&r1=1912280&r2=1912281&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
