summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortobigun <hennymcc@yahoo.de>2015-07-19 14:15:38 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-12-03 23:59:56 +0200
commitb4cb58fd8fc8ed4e52a77104b766773e2650e352 (patch)
tree546daa97101abd61485d78b10b56084b9b1a31cb /src
parent55f9a6a4d4352e320a4dd1b6f8b554945fa25006 (diff)
downloadandroid_packages_apps_Camera2-b4cb58fd8fc8ed4e52a77104b766773e2650e352.tar.gz
android_packages_apps_Camera2-b4cb58fd8fc8ed4e52a77104b766773e2650e352.tar.bz2
android_packages_apps_Camera2-b4cb58fd8fc8ed4e52a77104b766773e2650e352.zip
Fix crash if Exif-Tag buffer-length and component-count are both 0
Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
Diffstat (limited to 'src')
-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 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 {