diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 18:16:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 18:16:17 +0000 |
| commit | f4481c4d980e5a8c62c2d1351efc2ee89d492190 (patch) | |
| tree | 392a2735d6cbb17c75369c8f740b42b6b0c685b4 | |
| parent | 500fd41fd5a3dd8141be54e541931cca2ee0c465 (diff) | |
| parent | 711ebe64dd064a631aa3001fc914c333efed33aa (diff) | |
| download | android_hardware_interfaces-f4481c4d980e5a8c62c2d1351efc2ee89d492190.tar.gz android_hardware_interfaces-f4481c4d980e5a8c62c2d1351efc2ee89d492190.tar.bz2 android_hardware_interfaces-f4481c4d980e5a8c62c2d1351efc2ee89d492190.zip | |
Camera: Fix possible ExifUtils heap corruption am: aa5673385a am: 711ebe64dd
Change-Id: I4a423ed76e117f2809aeed53a5ce1ba4d6919fdc
| -rw-r--r-- | camera/common/1.0/default/Exif.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/common/1.0/default/Exif.cpp b/camera/common/1.0/default/Exif.cpp index 4de05c5de..413b6bb97 100644 --- a/camera/common/1.0/default/Exif.cpp +++ b/camera/common/1.0/default/Exif.cpp @@ -632,13 +632,13 @@ bool ExifUtilsImpl::setGpsTimestamp(const struct tm& t) { } bool ExifUtilsImpl::setImageHeight(uint32_t length) { - SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length); + SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length); SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION, length); return true; } bool ExifUtilsImpl::setImageWidth(uint32_t width) { - SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width); + SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width); SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION, width); return true; } |