diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-05-05 07:45:56 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-05-05 07:45:56 -0600 |
| commit | b5fb5c52614b7b5b326e0ca2b07832b34082fac0 (patch) | |
| tree | 74febb478f36639424e1db68b07f0777cf7a31fc | |
| parent | cc6ae3567368239c804267eab3e694b5aa2d477e (diff) | |
| parent | f53f4c35268154fd5e320bb39d772e8a61d200ff (diff) | |
| download | android_hardware_interfaces-b5fb5c52614b7b5b326e0ca2b07832b34082fac0.tar.gz android_hardware_interfaces-b5fb5c52614b7b5b326e0ca2b07832b34082fac0.tar.bz2 android_hardware_interfaces-b5fb5c52614b7b5b326e0ca2b07832b34082fac0.zip | |
Merge tag 'android-9.0.0_r56' of https://android.googlesource.com/platform/hardware/interfaces into staging/lineage-16.0_merge-android-9.0.0_r56lineage-16.0
Android 9.0.0 release 56
* tag 'android-9.0.0_r56' of https://android.googlesource.com/platform/hardware/interfaces:
Camera: Fix possible ExifUtils heap corruption
Change-Id: I40fb33deb15a29dce64759a409773b8cdd582c3a
| -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 6054999a0..b04c8084f 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; } |