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

Issue #685 | Fix StringIndexOutOfBoundsException in ICC DESC tag processing #687

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Issue #685 | Fix StringIndexOutOfBoundsException in ICC DESC tag processing #687

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Source/com/drew/metadata/icc/IccDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

package com.drew.metadata.icc;

import com.drew.lang.BufferBoundsException;
import com.drew.lang.ByteArrayReader;
import com.drew.lang.RandomAccessReader;
import com.drew.lang.annotations.NotNull;
Expand Down Expand Up @@ -91,6 +92,11 @@ private String getTagDataString(int tagType)
}
case ICC_TAG_TYPE_DESC:
int stringLength = reader.getInt32(8);

if (stringLength < 0 || stringLength > (bytes.length - 12)) {
throw new BufferBoundsException(12, stringLength, bytes.length);
}

return new String(bytes, 12, stringLength - 1);
case ICC_TAG_TYPE_SIG:
return IccReader.getStringFromInt32(reader.getInt32(8));
Expand Down
Loading