diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 17:58:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 17:58:27 +0000 |
| commit | 06b7522331a2ba20ee63aabee21c29ecc7287394 (patch) | |
| tree | 120c191031960562ca1a04d067e38c538dd7db03 | |
| parent | 29e2bfb97270d6c406e2b66664f5c5dd47a9ebb3 (diff) | |
| parent | f3f966faa6f46156726a338208f6c10a97d3fb4b (diff) | |
| download | frameworks_av-06b7522331a2ba20ee63aabee21c29ecc7287394.tar.gz frameworks_av-06b7522331a2ba20ee63aabee21c29ecc7287394.tar.bz2 frameworks_av-06b7522331a2ba20ee63aabee21c29ecc7287394.zip | |
Merge "Camera: Fix possible ExifUtils heap corruption" into qt-dev am: f3f966faa6
Change-Id: I1172c6499824d907555a7e4d5996c23b2f5c4b9d
| -rw-r--r-- | services/camera/libcameraservice/utils/ExifUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/utils/ExifUtils.cpp b/services/camera/libcameraservice/utils/ExifUtils.cpp index c0afdc18ca..8a0303a8e0 100644 --- a/services/camera/libcameraservice/utils/ExifUtils.cpp +++ b/services/camera/libcameraservice/utils/ExifUtils.cpp @@ -603,13 +603,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; } |