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 2016/02/29 19:52:55 UTC
svn commit: r1732932 -
/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Author: tilman
Date: Mon Feb 29 18:52:55 2016
New Revision: 1732932
URL: http://svn.apache.org/viewvc?rev=1732932&view=rev
Log:
PDFBOX-3254: avoid StringIndexOutOfBoundsException, improve msg
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=1732932&r1=1732931&r2=1732932&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 Mon Feb 29 18:52:55 2016
@@ -658,16 +658,21 @@ public class DomXmpParser
if (!token.endsWith("\"") && !token.endsWith("\'"))
{
throw new XmpParsingException(ErrorType.XpacketBadStart, "Cannot understand PI data part : '" + token
- + "'");
+ + "' in '" + data + "'");
}
String quote = token.substring(token.length() - 1);
int pos = token.indexOf("=" + quote);
if (pos <= 0)
{
throw new XmpParsingException(ErrorType.XpacketBadStart, "Cannot understand PI data part : '" + token
- + "'");
+ + "' in '" + data + "'");
}
String name = token.substring(0, pos);
+ if (token.length() - 1 < pos + 2)
+ {
+ throw new XmpParsingException(ErrorType.XpacketBadStart, "Cannot understand PI data part : '" + token
+ + "' in '" + data + "'");
+ }
String value = token.substring(pos + 2, token.length() - 1);
if ("id".equals(name))
{