Avoid an NPE when reading broken SlideShow-files

This commit is contained in:
Dominik Stadler 2026-01-06 23:19:22 +01:00
parent b195a3b9ed
commit c28aec61d4
2 changed files with 6 additions and 2 deletions

View File

@ -29,6 +29,7 @@ import java.lang.ref.WeakReference;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.sl.draw.Drawable;
import org.apache.poi.sl.usermodel.GroupShape;
import org.apache.poi.sl.usermodel.MasterSheet;
import org.apache.poi.sl.usermodel.Notes;
import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.sl.usermodel.Shape;
@ -76,8 +77,11 @@ public abstract class SlideShowHandler extends POIFSFileHandler {
}
}
for (Shape<?,?> shape : s.getMasterSheet()) {
readShapes(shape);
MasterSheet<?, ?> masterSheet = s.getMasterSheet();
if (masterSheet != null) {
for (Shape<?,?> shape : masterSheet) {
readShapes(shape);
}
}
}
}