diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 17:58:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 17:58:31 +0000 |
| commit | 711ebe64dd064a631aa3001fc914c333efed33aa (patch) | |
| tree | c814762b79f598365bc5b2952e8be3115254428a | |
| parent | 42b2f781be8d965920826d12ee464d1238aed8ec (diff) | |
| parent | aa5673385a4aad41f6f4de961365cb741f6dc7a8 (diff) | |
| download | android_hardware_interfaces-711ebe64dd064a631aa3001fc914c333efed33aa.tar.gz android_hardware_interfaces-711ebe64dd064a631aa3001fc914c333efed33aa.tar.bz2 android_hardware_interfaces-711ebe64dd064a631aa3001fc914c333efed33aa.zip | |
Camera: Fix possible ExifUtils heap corruption am: aa5673385a
Change-Id: I209742be498ea65b6763cf673514e74241b75717
| -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; } |