Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix null terminator and charset issues in heif implementation #370

Merged
merged 1 commit into from Oct 17, 2018
Merged

Fix null terminator and charset issues in heif implementation #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/com/drew/metadata/heif/boxes/HandlerBox.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
*/
package com.drew.metadata.heif.boxes;

import com.drew.lang.Charsets;
import com.drew.lang.SequentialReader;

import java.io.IOException;
Expand All @@ -41,7 +42,7 @@ public HandlerBox(SequentialReader reader, Box box) throws IOException
reader.skip(4); // Pre-defined
handlerType = reader.getString(4);
reader.skip(12); // Reserved
name = reader.getNullTerminatedString((int)box.size - 32, Charset.defaultCharset());
name = reader.getNullTerminatedString((int)box.size - 32, Charsets.UTF_8);
}

public String getHandlerType()
Expand Down
18 changes: 11 additions & 7 deletions Source/com/drew/metadata/heif/boxes/ItemInfoBox.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
*/
package com.drew.metadata.heif.boxes;

import com.drew.lang.Charsets;
import com.drew.lang.SequentialByteArrayReader;
import com.drew.lang.SequentialReader;
import com.drew.metadata.heif.HeifDirectory;
Expand Down Expand Up @@ -72,10 +73,10 @@ public ItemInfoEntry(SequentialReader reader, Box box) throws IOException
if ((version == 0) || (version == 1)) {
itemID = reader.getUInt16();
itemProtectionIndex = reader.getUInt16();
itemName = reader.getString(4);
contentType = reader.getString(4);
if (box.size - 28 > 0) {
extensionType = reader.getString((int)box.size - 28);
itemName = reader.getNullTerminatedString((int)(box.size - reader.getPosition()), Charsets.UTF_8);
contentType = reader.getNullTerminatedString((int)(box.size - reader.getPosition()), Charsets.UTF_8);
if (box.size - reader.getPosition() > 0) {
extensionType = reader.getNullTerminatedString((int) (box.size - reader.getPosition()), Charsets.UTF_8);
}
}
if (version == 1) {
Expand All @@ -92,11 +93,14 @@ public ItemInfoEntry(SequentialReader reader, Box box) throws IOException
itemProtectionIndex = reader.getUInt16();
itemType = reader.getString(4);

itemName = reader.getString(4);
itemName = reader.getNullTerminatedString((int)(box.size - reader.getPosition()), Charsets.UTF_8);
if (itemType.equals("mime")) {
contentType = reader.getString(4);
contentType = reader.getNullTerminatedString((int)(box.size - reader.getPosition()), Charsets.UTF_8);
if (box.size - reader.getPosition() > 0) {
contentEncoding = reader.getNullTerminatedString((int)(box.size - reader.getPosition()), Charsets.UTF_8);
}
} else if (itemType.equals("uri ")) {
itemUriType = reader.getString(4);
itemUriType = reader.getString((int)(box.size - reader.getPosition()));
}
}
}
Expand Down