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

Merge "ExifInterface: fix logs" into nyc-dev

Browse Source
This commit is contained in:
Jaesung Chung
2016-03-22 05:39:25 +00:00
committed by Android (Google) Code Review
parent f2a1076cd3 c2916968aa
commit 285bbbbda4
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -830,7 +830,9 @@ public class ExifInterface {
} catch (IOException e) { } catch (IOException e) {
// Ignore exceptions in order to keep the compatibility with the old versions of // Ignore exceptions in order to keep the compatibility with the old versions of
// ExifInterface. // ExifInterface.
Log.w(TAG, "Invalid JPEG", e); Log.w(TAG, "Invalid JPEG: ExifInterface got an unsupported image format file"
+ "(ExifInterface supports JPEG and some RAW image formats only) "
+ "or a corrupted JPEG file to ExifInterface.", e);
} }
if (DEBUG) { if (DEBUG) {
@@ -1189,6 +1191,10 @@ public class ExifInterface {
++bytesRead; ++bytesRead;
while (true) { while (true) {
marker = dataInputStream.readByte(); marker = dataInputStream.readByte();
if (marker == -1) {
Log.w(TAG, "Reading JPEG has ended unexpectedly");
break;
}
if (marker != MARKER) { if (marker != MARKER) {
throw new IOException("Invalid marker:" + Integer.toHexString(marker & 0xff)); throw new IOException("Invalid marker:" + Integer.toHexString(marker & 0xff));
} }
@@ -1207,7 +1213,8 @@ public class ExifInterface {
int length = dataInputStream.readUnsignedShort() - 2; int length = dataInputStream.readUnsignedShort() - 2;
bytesRead += 2; bytesRead += 2;
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "JPEG segment: " + marker + " (length: " + (length + 2) + ")"); Log.d(TAG, "JPEG segment: " + Integer.toHexString(marker & 0xff) + " (length: "
+ (length + 2) + ")");
} }
if (length < 0) { if (length < 0) {
throw new IOException("Invalid length"); throw new IOException("Invalid length");
@@ -1270,7 +1277,9 @@ public class ExifInterface {
case MARKER_SOF13: case MARKER_SOF13:
case MARKER_SOF14: case MARKER_SOF14:
case MARKER_SOF15: { case MARKER_SOF15: {
dataInputStream.skipBytes(1); if (dataInputStream.skipBytes(1) != 1) {
throw new IOException("Invalid SOFx");
}
setAttribute("ImageLength", setAttribute("ImageLength",
String.valueOf(dataInputStream.readUnsignedShort())); String.valueOf(dataInputStream.readUnsignedShort()));
setAttribute("ImageWidth", String.valueOf(dataInputStream.readUnsignedShort())); setAttribute("ImageWidth", String.valueOf(dataInputStream.readUnsignedShort()));
@@ -1285,7 +1294,9 @@ public class ExifInterface {
if (length < 0) { if (length < 0) {
throw new IOException("Invalid length"); throw new IOException("Invalid length");
} }
dataInputStream.skipBytes(length); if (dataInputStream.skipBytes(length) != length) {
throw new IOException("Invalid JPEG segment");
}
bytesRead += length; bytesRead += length;
} }
} }
@@ -1317,10 +1328,15 @@ public class ExifInterface {
byte[] bytes = new byte[4096]; byte[] bytes = new byte[4096];
while (true) { while (true) {
if (dataInputStream.readByte() != MARKER) { byte marker = dataInputStream.readByte();
if (marker == -1) {
Log.w(TAG, "Reading JPEG has ended unexpectedly");
break;
}
if (marker != MARKER) {
throw new IOException("Invalid marker"); throw new IOException("Invalid marker");
} }
byte marker = dataInputStream.readByte(); marker = dataInputStream.readByte();
switch (marker) { switch (marker) {
case MARKER_APP1: { case MARKER_APP1: {
int length = dataInputStream.readUnsignedShort() - 2; int length = dataInputStream.readUnsignedShort() - 2;
@@ -1644,7 +1660,7 @@ public class ExifInterface {
String tagName = (String) sExifTagMapsForReading[hint].get(tagNumber); String tagName = (String) sExifTagMapsForReading[hint].get(tagNumber);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d," + Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d, " +
"numberOfComponents: %d", hint, tagNumber, tagName, dataFormat, "numberOfComponents: %d", hint, tagNumber, tagName, dataFormat,
numberOfComponents)); numberOfComponents));
} }