mirror of
https://github.com/apache/poi.git
synced 2026-02-27 20:40:08 +08:00
Avoid an NPE when reading broken SlideShow-files
This commit is contained in:
parent
b195a3b9ed
commit
c28aec61d4
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BIN
test-data/slideshow/7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt
Normal file
BIN
test-data/slideshow/7ffe3cabb976ebc593dfe2f9461bdeac980a626c.ppt
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user