summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <hennymcc@yahoo.de>2015-07-19 14:15:38 +0200
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:03:18 +0100
commit04ed1359bf3c827eb7be976d315b15278f7c8b7c (patch)
treeaf0d32047c8c0df966444d4dbf9549b64d9ce334
parent91082ba8921d543dfaebb0be7ebca0cf4f9b089b (diff)
downloadandroid_packages_apps_Snap-04ed1359bf3c827eb7be976d315b15278f7c8b7c.tar.gz
android_packages_apps_Snap-04ed1359bf3c827eb7be976d315b15278f7c8b7c.tar.bz2
android_packages_apps_Snap-04ed1359bf3c827eb7be976d315b15278f7c8b7c.zip
Fix crash if Exif-Tag buffer-length and component-count are both 0
Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
-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 {