diff options
| -rw-r--r-- | poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java | 2 | ||||
| -rw-r--r-- | poi/src/main/java/org/apache/poi/util/XMLHelper.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index cb736d599e..29bbde1239 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -1887,7 +1887,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { SAXParseException e = assertThrows(SAXParseException.class, () -> reader.parse(new InputSource(zip.getInputStream(ze)))); assertNotNull(e.getMessage()); - assertTrue(e.getMessage().contains("more than \"1\" entity")); + assertNotEquals(isOldXercesActive(), e.getMessage().contains("DOCTYPE is disallowed when the feature")); } } diff --git a/poi/src/main/java/org/apache/poi/util/XMLHelper.java b/poi/src/main/java/org/apache/poi/util/XMLHelper.java index e27c976d28..87a481b04c 100644 --- a/poi/src/main/java/org/apache/poi/util/XMLHelper.java +++ b/poi/src/main/java/org/apache/poi/util/XMLHelper.java @@ -157,6 +157,7 @@ public final class XMLHelper { trySet(factory::setFeature, FEATURE_LOAD_DTD_GRAMMAR, false); trySet(factory::setFeature, FEATURE_LOAD_EXTERNAL_DTD, false); trySet(factory::setFeature, FEATURE_EXTERNAL_ENTITIES, false); + trySet(factory::setFeature, FEATURE_DISALLOW_DOCTYPE_DECL, true); return factory; } catch (RuntimeException | Error re) { // NOSONAR // this also catches NoClassDefFoundError, which may be due to a local class path issue |