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

Fix bug in 0-terminated ASCII string parsing + test.

Browse Source
This commit is contained in:
Harald Kuhr
2022-05-18 20:54:25 +02:00
parent 8992406f50
commit d50fb1a51e
4 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAExtensions.java
+1
View File
@@ -162,6 +162,7 @@ final class TGAExtensions {
for (int i = 0; i < data.length; i++) {
if (data[i] == 0) {
len = i;
break;
}
}
imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReader.java
+6 -11
View File
@@ -393,27 +393,22 @@ final class TGAImageReader extends ImageReaderBase {
// Read header
header = TGAHeader.read(imageInput);
// System.err.println("header: " + header);
imageInput.flushBefore(imageInput.getStreamPosition());
// Read footer, if 2.0 format (ends with TRUEVISION-XFILE\0)
skipToEnd(imageInput);
imageInput.seek(imageInput.getStreamPosition() - 26);
long extOffset = imageInput.readInt();
/*long devOffset = */imageInput.readInt(); // Ignored for now
long extOffset = imageInput.readUnsignedInt();
/*long devOffset = */imageInput.readUnsignedInt(); // Ignored for now
byte[] magic = new byte[18];
imageInput.readFully(magic);
if (Arrays.equals(magic, TGA.MAGIC)) {
if (extOffset > 0) {
imageInput.seek(extOffset);
int extSize = imageInput.readUnsignedShort();
extensions = extSize == 0 ? null : TGAExtensions.read(imageInput, extSize);
}
if (Arrays.equals(magic, TGA.MAGIC) && extOffset > 0) {
imageInput.seek(extOffset);
int extSize = imageInput.readUnsignedShort();
extensions = extSize == 0 ? null : TGAExtensions.read(imageInput, extSize);
}
}
imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java
+2 -2
View File
@@ -296,7 +296,7 @@ final class TGAMetadata extends AbstractMetadata {
}
if (extensions != null) {
appendTextEntry(text, "Software", extensions.getSoftwareVersion() == null ? extensions.getSoftware() : extensions.getSoftware() + " " + extensions.getSoftwareVersion());
appendTextEntry(text, "Software", extensions.getSoftwareVersion() == null ? extensions.getSoftware() : (extensions.getSoftware() + " " + extensions.getSoftwareVersion()));
appendTextEntry(text, "Artist", extensions.getAuthorName());
appendTextEntry(text, "UserComment", extensions.getAuthorComments());
}
@@ -305,7 +305,7 @@ final class TGAMetadata extends AbstractMetadata {
}
private void appendTextEntry(final IIOMetadataNode parent, final String keyword, final String value) {
if (value != null) {
if (value != null && !value.isEmpty()) {
IIOMetadataNode textEntry = new IIOMetadataNode("TextEntry");
parent.appendChild(textEntry);
textEntry.setAttribute("keyword", keyword);