Loading media/java/android/media/ExifInterface.java +14 −7 Original line number Diff line number Diff line Loading @@ -2193,21 +2193,28 @@ public class ExifInterface { dataFormat, numberOfComponents)); } if (tag == null || dataFormat <= 0 || dataFormat >= IFD_FORMAT_BYTES_PER_FORMAT.length) { // Skip if the parsed tag number is not defined or invalid data format. long byteCount = 0; boolean valid = false; if (tag == null) { Log.w(TAG, "Skip the tag entry since tag number is not defined: " + tagNumber); } else { } else if (dataFormat <= 0 || dataFormat >= IFD_FORMAT_BYTES_PER_FORMAT.length) { Log.w(TAG, "Skip the tag entry since data format is invalid: " + dataFormat); } else { byteCount = (long) numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]; if (byteCount < 0 || byteCount > Integer.MAX_VALUE) { Log.w(TAG, "Skip the tag entry since number of components is invalid: " + numberOfComponents); } else { valid = true; } } if (!valid) { dataInputStream.seek(nextEntryOffset); continue; } // Read a value from data field or seek to the value offset which is stored in data // field if the size of the entry value is bigger than 4. int byteCount = numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]; if (byteCount > 4) { long offset = dataInputStream.readUnsignedInt(); if (DEBUG) { Loading Loading
media/java/android/media/ExifInterface.java +14 −7 Original line number Diff line number Diff line Loading @@ -2193,21 +2193,28 @@ public class ExifInterface { dataFormat, numberOfComponents)); } if (tag == null || dataFormat <= 0 || dataFormat >= IFD_FORMAT_BYTES_PER_FORMAT.length) { // Skip if the parsed tag number is not defined or invalid data format. long byteCount = 0; boolean valid = false; if (tag == null) { Log.w(TAG, "Skip the tag entry since tag number is not defined: " + tagNumber); } else { } else if (dataFormat <= 0 || dataFormat >= IFD_FORMAT_BYTES_PER_FORMAT.length) { Log.w(TAG, "Skip the tag entry since data format is invalid: " + dataFormat); } else { byteCount = (long) numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]; if (byteCount < 0 || byteCount > Integer.MAX_VALUE) { Log.w(TAG, "Skip the tag entry since number of components is invalid: " + numberOfComponents); } else { valid = true; } } if (!valid) { dataInputStream.seek(nextEntryOffset); continue; } // Read a value from data field or seek to the value offset which is stored in data // field if the size of the entry value is bigger than 4. int byteCount = numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]; if (byteCount > 4) { long offset = dataInputStream.readUnsignedInt(); if (DEBUG) { Loading