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 2014/05/13 19:54:59 UTC
svn commit: r1594305 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
Author: tilman
Date: Tue May 13 17:54:59 2014
New Revision: 1594305
URL: http://svn.apache.org/r1594305
Log:
PDFBOX-2073: Be more restrictive than the PDF spec
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=1594305&r1=1594304&r2=1594305&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Tue May 13 17:54:59 2014
@@ -1742,24 +1742,26 @@ public final class COSName extends COSBa
{
int current = ((bytes[i]+256)%256);
- if(current <= 32 || current >= 127 ||
- current == '(' ||
- current == ')' ||
- current == '[' ||
- current == ']' ||
- current == '/' ||
- current == '%' ||
- current == '<' ||
- current == '>' ||
- current == '{' || current == '}' || // PDFBOX-2073
- current == NAME_ESCAPE[0] )
+ // Be more restrictive than the PDF spec, "Name Objects"
+ // see PDFBOX-2073
+ if ((current >= 'A' && current <= 'Z')
+ || (current >= 'a' && current <= 'z')
+ || (current >= '0' && current <= '9')
+ || current == '+'
+ || current == '-'
+ || current == '_'
+ || current == '@'
+ || current == '*'
+ || current == '$'
+ || current == ';'
+ || current == '.')
{
- output.write(NAME_ESCAPE);
- output.write(COSHEXTable.TABLE[current]);
+ output.write(current);
}
else
{
- output.write(current);
+ output.write(NAME_ESCAPE);
+ output.write(COSHEXTable.TABLE[current]);
}
}
}