diff options
author | tobigun <hennymcc@yahoo.de> | 2015-07-19 14:15:38 +0200 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 17:21:22 +0200 |
commit | f1154fa97084d8601fe4f1ca61cc350b6a29693d (patch) | |
tree | a5dc4ccae9ce2029c27211015c4c14d6212a42a6 | |
parent | 68c315b220a5abd7c754592369ab349888fb1779 (diff) | |
download | android_packages_apps_Camera2-f1154fa97084d8601fe4f1ca61cc350b6a29693d.tar.gz android_packages_apps_Camera2-f1154fa97084d8601fe4f1ca61cc350b6a29693d.tar.bz2 android_packages_apps_Camera2-f1154fa97084d8601fe4f1ca61cc350b6a29693d.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.java | 2 |
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 3c7ed7d6e..d7c832069 100644 --- a/src/com/android/camera/exif/ExifOutputStream.java +++ b/src/com/android/camera/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 { |