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 with malformed anchors in slideshow files

Browse Source
This commit is contained in:
Dominik Stadler 2026-02-14 17:15:14 +01:00
parent 5338b17a8f
commit 55c1608a2d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
View File

@ -204,12 +204,16 @@ implements HSLFShapeContainer, GroupShape<HSLFShape,HSLFTextParagraph> {
* @return the anchor of this shape group * @return the anchor of this shape group
*/ */
@Override @Override
public Rectangle2D getAnchor(){ public Rectangle2D getAnchor() {
EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID); EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
int x1,y1,x2,y2; int x1,y1,x2,y2;
if(clientAnchor == null){ if(clientAnchor == null) {
LOG.atInfo().log("EscherClientAnchorRecord was not found for shape group. Searching for EscherChildAnchorRecord."); LOG.atInfo().log("EscherClientAnchorRecord was not found for shape group. Searching for EscherChildAnchorRecord.");
EscherChildAnchorRecord rec = getEscherChild(EscherChildAnchorRecord.RECORD_ID); EscherChildAnchorRecord rec = getEscherChild(EscherChildAnchorRecord.RECORD_ID);
if (rec == null) {
throw new IllegalStateException("Cannot get anchor, neither had an EscherClientAnchorRecord nor an EscherChildAnchorRecord");
}
x1 = rec.getDx1(); x1 = rec.getDx1();
y1 = rec.getDy1(); y1 = rec.getDy1();
x2 = rec.getDx2(); x2 = rec.getDx2();

BIN
test-data/slideshow/62d2ecd89aeb715b07072d4f8a8734f4dbeb5c10.ppt Normal file
View File

Binary file not shown.

BIN
test-data/spreadsheet/stress.xls
View File

Binary file not shown.