Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 68fcbf5..654a08a 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1325,12 +1325,12 @@
* determine whether the image data format is JPEG or not.
*/
private void loadAttributes() throws IOException {
+ // Initialize mAttributes.
+ for (int i = 0; i < EXIF_TAGS.length; ++i) {
+ mAttributes[i] = new HashMap();
+ }
try {
InputStream in = new FileInputStream(mFilename);
- // Initialize mAttributes.
- for (int i = 0; i < EXIF_TAGS.length; ++i) {
- mAttributes[i] = new HashMap();
- }
getJpegAttributes(in);
} catch (IOException e) {
// Ignore exceptions in order to keep the compatibility with the old versions of