Bug 57163: Fix possible NullPointerException when a spreadsheet has no LinkTable and we try to adjust it during sheet removal.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1673168 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2015-04-13 12:19:11 +00:00
parent 570819e4f6
commit 12c220121e
3 changed files with 16 additions and 5 deletions

View File

@ -774,13 +774,14 @@ public final class InternalWorkbook {
} }
} }
if (linkTable != null) {
// also tell the LinkTable about the removed sheet // also tell the LinkTable about the removed sheet
// +1 because we already removed it from the count of sheets! // +1 because we already removed it from the count of sheets!
for(int i = sheetIndex+1;i < getNumSheets()+1;i++) { for(int i = sheetIndex+1;i < getNumSheets()+1;i++) {
// also update the link-table as otherwise references might point at invalid sheets
linkTable.removeSheet(i); linkTable.removeSheet(i);
} }
} }
}
/** /**
* make the tabid record look like the current situation. * make the tabid record look like the current situation.

View File

@ -2716,4 +2716,14 @@ public final class TestBugs extends BaseTestBugzillaIssues {
Workbook wb = openSample("57456.xls"); Workbook wb = openSample("57456.xls");
wb.close(); wb.close();
} }
@Test
public void test57163() throws IOException {
Workbook wb = openSample("57163.xls");
while (wb.getNumberOfSheets() > 1) {
wb.removeSheetAt(1);
}
wb.close();
}
} }

Binary file not shown.