pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE when a row in a workbook was deleted and thus getRow() returns null

Browse Source
This commit is contained in:
Dominik Stadler 2026-01-11 18:58:55 +01:00
parent d93a29ae67
commit ac4295deac
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
View File

@ -156,7 +156,7 @@ public class XSSFExportToXml implements Comparator<String>{
indexMap.clear();
xpaths.sort(this);
indexMap.clear();
for(String xpath : xpaths) {
XSSFSingleXmlCell simpleXmlCell = singleXmlCellsMappings.get(xpath);
@ -170,7 +170,7 @@ public class XSSFExportToXml implements Comparator<String>{
if (cell!=null) {
Node currentNode = getNodeByXPath(xpath,doc.getFirstChild(),doc,false);
mapCellOnNode(cell,currentNode);
//remove nodes which are empty in order to keep the output xml valid
// FIXME: what should be done if currentNode.getTextContent() is null?
if ("".equals(currentNode.getTextContent()) && currentNode.getParentNode() != null) {
@ -192,6 +192,11 @@ public class XSSFExportToXml implements Comparator<String>{
for(int i = startRow; i<= endRow; i++) {
XSSFRow row = sheet.getRow(i);
// some external created files can miss rows
if (row == null) {
continue;
}
Node tableRootNode = getNodeByXPath(table.getCommonXpath(), doc.getFirstChild(), doc, true);
short startColumnIndex = table.getStartCellReference().getCol();
@ -255,7 +260,7 @@ public class XSSFExportToXml implements Comparator<String>{
Schema schema = factory.newSchema(source);
Validator validator = schema.newValidator();
validator.validate(new DOMSource(xml));
//if no exceptions where raised, the document is valid
return true;
} catch(IOException e) {
@ -289,8 +294,8 @@ public class XSSFExportToXml implements Comparator<String>{
}
}
break;
case NUMERIC:
case NUMERIC:
if (DateUtil.isCellDateFormatted(cell)) {
value = getFormattedDate(cell);
} else {
@ -459,7 +464,7 @@ public class XSSFExportToXml implements Comparator<String>{
}
return Integer.compare(leftIndexOf, rightIndexOf);
}
private int getAndStoreIndex(String samePath,String withoutNamespace) {
String withPath = samePath+"/"+withoutNamespace;
return indexMap.getOrDefault(withPath, -1);
@ -470,7 +475,7 @@ public class XSSFExportToXml implements Comparator<String>{
if(returnNode != null) {
return returnNode;
}
return node.getAttributes().getNamedItem("name");
}

14
poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
View File

@ -677,6 +677,20 @@ public final class TestXSSFExportToXML {
}
}
@Test
void testMissingRow() throws Exception {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("xxe_in_schema.xlsx")) {
// delete the row to cause a null-row
wb.getSheetAt(0).removeRow(wb.getSheetAt(0).getRow(9));
for (XSSFMap map : wb.getCustomXMLMappings()) {
XSSFExportToXml exporter = new XSSFExportToXml(map);
UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get();
assertThrows(SAXParseException.class, () -> exporter.exportToXML(bos, true));
}
}
}
private static class XPathNSContext implements NamespaceContext {
final Map<String,String> nsMap = new HashMap<>();