This is an automated email from the ASF dual-hosted git repository. centic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/poi.git
commit c28aec61d4cc9a6657ccc92c627983a13ee2dfaa Author: Dominik Stadler <[email protected]> AuthorDate: Tue Jan 6 23:19:22 2026 +0100 Avoid an NPE when reading broken SlideShow-files --- .../java/org/apache/poi/stress/SlideShowHandler.java | 8 ++++++-- .../7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt | Bin 0 -> 13312 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java index 305793cd1e..9166094540 100644 --- a/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java +++ b/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java @@ -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); + } } } } diff --git a/test-data/slideshow/7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt b/test-data/slideshow/7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt new file mode 100644 index 0000000000..439a103648 Binary files /dev/null and b/test-data/slideshow/7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt differ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
