Camera: Fix possible ExifUtils heap corruption am: aa5673385a

Change-Id: I209742be498ea65b6763cf673514e74241b75717
This commit is contained in:
Automerger Merge Worker
2020-03-04 17:58:31 +00:00

View File

@@ -632,13 +632,13 @@ bool ExifUtilsImpl::setGpsTimestamp(const struct tm& t) {
} }
bool ExifUtilsImpl::setImageHeight(uint32_t length) { 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); SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION, length);
return true; return true;
} }
bool ExifUtilsImpl::setImageWidth(uint32_t width) { 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); SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION, width);
return true; return true;
} }