mirror of https://github.com/apache/poi.git
Bug 66425: Avoid exceptions found via poi-fuzz
Prevent a NullPointerException Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=68104 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1919215 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
fc17f113d8
commit
a042165133
|
@ -27,6 +27,8 @@ import java.util.Map;
|
|||
import com.microsoft.schemas.office.visio.x2012.main.MasterType;
|
||||
import com.microsoft.schemas.office.visio.x2012.main.MastersDocument;
|
||||
import com.microsoft.schemas.office.visio.x2012.main.MastersType;
|
||||
import com.microsoft.schemas.office.visio.x2012.main.RelType;
|
||||
|
||||
import org.apache.poi.ooxml.POIXMLDocumentPart;
|
||||
import org.apache.poi.ooxml.POIXMLException;
|
||||
import org.apache.poi.openxml4j.opc.PackagePart;
|
||||
|
@ -68,7 +70,10 @@ public class XDGFMasters extends XDGFXMLDocumentPart {
|
|||
|
||||
Map<String, MasterType> masterSettings = new HashMap<>();
|
||||
for (MasterType master: _mastersObject.getMasterArray()) {
|
||||
masterSettings.put(master.getRel().getId(), master);
|
||||
RelType rel = master.getRel();
|
||||
if (rel != null) {
|
||||
masterSettings.put(rel.getId(), master);
|
||||
}
|
||||
}
|
||||
|
||||
// create the masters
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue