Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 03:25:28 -04:00
Code Issues Projects Releases Wiki Activity

TMI-XXX: Made the PSD XMP parser slightly more lenient.

Browse Source
This commit is contained in:
Harald Kuhr 2012-05-31 16:24:17 +02:00
parent 289be6ca12
commit 7f2ad765cf
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java
View File

@ -2,13 +2,11 @@ package com.twelvemonkeys.imageio.plugins.psd;
import com.twelvemonkeys.imageio.metadata.Directory; import com.twelvemonkeys.imageio.metadata.Directory;
import com.twelvemonkeys.imageio.metadata.xmp.XMPReader; import com.twelvemonkeys.imageio.metadata.xmp.XMPReader;
import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
import com.twelvemonkeys.lang.StringUtil; import com.twelvemonkeys.lang.StringUtil;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import java.io.ByteArrayInputStream; import java.io.*;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
/** /**
@ -32,9 +30,17 @@ final class PSDXMPData extends PSDImageResource {
@Override @Override
protected void readData(final ImageInputStream pInput) throws IOException { protected void readData(final ImageInputStream pInput) throws IOException {
data = new byte[(int) size]; // TODO: Fix potential overflow, or document why that can't happen (read spec) data = new byte[(int) size]; // TODO: Fix potential overflow, or document why that can't happen (read spec)
//pInput.readFully(data); pInput.readFully(data);
directory = new XMPReader().read(pInput); // Chop off potential trailing null-termination/padding that SAX parsers don't like...
int len = data.length;
for (; len > 0; len--) {
if (data[len - 1] != 0) {
break;
}
}
directory = new XMPReader().read(new ByteArrayImageInputStream(data, 0, len));
} }
@Override @Override