summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authortobigun <hennymcc@yahoo.de>2015-07-19 14:15:38 +0200
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:50 -0700
commitdef7886f3c76253e0cd55fa7af75d3fd0c1bd0ee (patch)
treeee937c04e0adb7027306c2b11f4ce3adfc587cc6 /src/com
parentc9e439fbf9a81c3ed55ab896003c75e70691dc9a (diff)
downloadandroid_packages_apps_Snap-def7886f3c76253e0cd55fa7af75d3fd0c1bd0ee.tar.gz
android_packages_apps_Snap-def7886f3c76253e0cd55fa7af75d3fd0c1bd0ee.tar.bz2
android_packages_apps_Snap-def7886f3c76253e0cd55fa7af75d3fd0c1bd0ee.zip
Fix crash if Exif-Tag buffer-length and component-count are both 0
Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/exif/ExifOutputStream.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/exif/ExifOutputStream.java b/src/com/android/camera/exif/ExifOutputStream.java
index 90d432769..47b95d80f 100644
--- a/src/com/android/camera/exif/ExifOutputStream.java
+++ b/src/com/android/camera/exif/ExifOutputStream.java
@@ -491,7 +491,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 {