commit ac9e77fbb502148564de03588269c87470b4ccfb
author huans <huans@google.com> Fri Dec 22 09:58:51 2017 -0800
committer huans <huans@google.com> Tue Jan 30 16:00:40 2018 -0800
tree 6dce739b82b9c4abbb5656ce8ff375cbd3ded890
parent 5e76e23ffd35f33a79d065e7ee9387382b972a20

Fix CTS android.hardware.cts.CameraTest#testJpegExif

Bug: 70863791
Test: run CTS
Change-Id: If3a52573a39037d8548ab6428ad97a60f8cadf8d

camera/Exif.cpp

diff --git a/camera/Exif.cpp b/camera/Exif.cpp
index bd8e93a..f7f85f5 100644
--- a/camera/Exif.cpp
+++ b/camera/Exif.cpp
@@ -450,7 +450,7 @@
         data.insert(data.end(),
                     std::begin(kAsciiPrefix),
                     std::end(kAsciiPrefix));
-        data.insert(data.end(), stringValue, stringValue + strlen(stringValue));
+        data.insert(data.end(), stringValue, stringValue + entry.count);
         createEntry(exifData, EXIF_IFD_GPS, EXIF_TAG_GPS_PROCESSING_METHOD,
                     &data[0], data.size());
     }