You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/07/31 19:08:24 UTC
svn commit: r1891934 -
/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Author: tilman
Date: Sat Jul 31 19:08:23 2021
New Revision: 1891934
URL: http://svn.apache.org/viewvc?rev=1891934&view=rev
Log:
PDFBOX-4892: avoid NPE, as suggested by valerybokov
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java?rev=1891934&r1=1891933&r2=1891934&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java Sat Jul 31 19:08:23 2021
@@ -380,6 +380,11 @@ public class DomXmpParser
if (DomHelper.isParseTypeResource(property))
{
AbstractStructuredType ast = parseLiDescription(xmp, DomHelper.getQName(property), property);
+ if (ast == null)
+ {
+ throw new XmpParsingException(ErrorType.Format, "property should contain child elements : "
+ + property);
+ }
ast.setPrefix(prefix);
container.addProperty(ast);
}
@@ -392,6 +397,11 @@ public class DomXmpParser
+ property);
}
AbstractStructuredType ast = parseLiDescription(xmp, DomHelper.getQName(property), inner);
+ if (ast == null)
+ {
+ throw new XmpParsingException(ErrorType.Format, "inner element should contain child elements : "
+ + inner);
+ }
ast.setPrefix(prefix);
container.addProperty(ast);
}
@@ -416,6 +426,11 @@ public class DomXmpParser
{
nsFinder.push(inner);
AbstractStructuredType ast = parseLiDescription(xmp, DomHelper.getQName(property), inner);
+ if (ast == null)
+ {
+ throw new XmpParsingException(ErrorType.Format, "inner element should contain child elements : "
+ + inner);
+ }
ast.setPrefix(prefix);
container.addProperty(ast);
}