moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bugzilla 52211 - avoid unnessary re-coverting content types to US-ASCII, it can cause exceptions on ibm mainframes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1394001 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2012-10-04 11:52:20 +00:00
parent 7290c5fabd
commit 57bbac29fe
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<changes> <changes>
<release version="3.9-beta1" date="2012-??-??"> <release version="3.9-beta1" date="2012-??-??">
<action dev="poi-developers" type="fix">52211 - avoid unnessary re-coverting content types to US-ASCII, it can cause exceptions on ibm mainframes</action>
<action dev="poi-developers" type="fix">53568 - Set shapes anchors in XSSF when reading from existing drawings</action> <action dev="poi-developers" type="fix">53568 - Set shapes anchors in XSSF when reading from existing drawings</action>
<action dev="poi-developers" type="add">HSSFOptimiser will now also tidy away un-used cell styles, in addition to duplicate styles</action> <action dev="poi-developers" type="add">HSSFOptimiser will now also tidy away un-used cell styles, in addition to duplicate styles</action>
<action dev="poi-developers" type="fix">53493 - Fixed memory and temporary file leak in SXSSF </action> <action dev="poi-developers" type="fix">53493 - Fixed memory and temporary file leak in SXSSF </action>

11
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
View File

@ -134,16 +134,7 @@ public final class ContentType {
* If the specified content type is not valid with RFC 2616. * If the specified content type is not valid with RFC 2616.
*/ */
public ContentType(String contentType) throws InvalidFormatException { public ContentType(String contentType) throws InvalidFormatException {
// Conversion en US-ASCII Matcher mMediaType = patternMediaType.matcher(contentType);
String contentTypeASCII = null;
try {
contentTypeASCII = new String(contentType.getBytes(), "US-ASCII");
} catch (UnsupportedEncodingException e) {
throw new InvalidFormatException(
"The specified content type is not an ASCII value.");
}
Matcher mMediaType = patternMediaType.matcher(contentTypeASCII);
if (!mMediaType.matches()) if (!mMediaType.matches())
throw new InvalidFormatException( throw new InvalidFormatException(
"The specified content type '" "The specified content type '"

4
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
View File

@ -85,7 +85,9 @@ public final class TestContentType extends TestCase {
*/ */
public void testContentTypeParameterFailure() { public void testContentTypeParameterFailure() {
String[] contentTypesToTest = new String[] { "mail/toto;titi=tata", String[] contentTypesToTest = new String[] { "mail/toto;titi=tata",
"text/xml;a=b;c=d", "mail/toto;\"titi=tata\"" }; "text/xml;a=b;c=d", "mail/toto;\"titi=tata\"",
"text/\u0080" // characters above ASCII are not allowed
};
for (int i = 0; i < contentTypesToTest.length; ++i) { for (int i = 0; i < contentTypesToTest.length; ++i) {
try { try {
new ContentType(contentTypesToTest[i]); new ContentType(contentTypesToTest[i]);