Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06b75223 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Camera: Fix possible ExifUtils heap corruption" into qt-dev am: f3f966fa 

Change-Id: I1172c6499824d907555a7e4d5996c23b2f5c4b9d
parents 29e2bfb9 f3f966fa

services/camera/libcameraservice/utils/ExifUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

}