Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix data source for HEIF exif extractor"

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-23 17:36:33 +00:00
committed by Gerrit Code Review
parent 0915931939 f2b041dce0
commit 31bbb473ce
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/ExifInterface.java
View File

@@ -2545,7 +2545,9 @@ public class ExifInterface {
if (size == 0) { if (size == 0) {
return 0; return 0;
} }
if (position < 0) { // We don't allow read positions after the available bytes,
// the input stream won't be able to seek back then.
if (position < 0 || position >= in.available()) {
return -1; return -1;
} }
try { try {
@@ -2554,6 +2556,13 @@ public class ExifInterface {
mPosition = position; mPosition = position;
} }
// If the read will cause us to go over the available bytes,
// reduce the size so that we stay in the available range.
// Otherwise the input stream may not be able to seek back.
if (mPosition + size > in.available()) {
size = in.available() - (int)mPosition;
}
int bytesRead = in.read(buffer, offset, size); int bytesRead = in.read(buffer, offset, size);
if (bytesRead >= 0) { if (bytesRead >= 0) {
mPosition += bytesRead; mPosition += bytesRead;