summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <hennymcc@yahoo.de>2015-07-19 14:15:38 +0200
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:47 +0200
commit5403c805a4bd181dc55cd9a5a09690e8d8bcbefe (patch)
treec132510299318bb1483a586fc644148f48925bf2
parentf4f4879694fdcf59a75942ddd6fd98d87d0b13e9 (diff)
downloadandroid_packages_apps_Snap-5403c805a4bd181dc55cd9a5a09690e8d8bcbefe.tar.gz
android_packages_apps_Snap-5403c805a4bd181dc55cd9a5a09690e8d8bcbefe.tar.bz2
android_packages_apps_Snap-5403c805a4bd181dc55cd9a5a09690e8d8bcbefe.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 {