diff options
author | tobigun <hennymcc@yahoo.de> | 2015-07-19 14:15:38 +0200 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-02 01:23:04 -0800 |
commit | f6a8d4f481fb17c271d84415761fb0e08794d8a2 (patch) | |
tree | 5088622d39df0efa4e89c456c51714faba4c958d | |
parent | 88dc0de52961f2337b9c308a5506acfa50940722 (diff) | |
download | android_packages_apps_Trebuchet-f6a8d4f481fb17c271d84415761fb0e08794d8a2.tar.gz android_packages_apps_Trebuchet-f6a8d4f481fb17c271d84415761fb0e08794d8a2.tar.bz2 android_packages_apps_Trebuchet-f6a8d4f481fb17c271d84415761fb0e08794d8a2.zip |
Fix crash if Exif-Tag buffer-length and component-count are both 0
Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
-rw-r--r-- | WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java index 7ca05f2e0..4c2009fac 100644 --- a/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java +++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java @@ -482,7 +482,7 @@ class ExifOutputStream extends FilterOutputStream { switch (tag.getDataType()) { case ExifTag.TYPE_ASCII: byte buf[] = tag.getStringByte(); - if (buf.length == tag.getComponentCount()) { + if (buf.length == tag.getComponentCount() && buf.length > 0) { buf[buf.length - 1] = 0; dataOutputStream.write(buf); } else { |