Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure correct read of jpeg header blob" into tm-dev am: e2d9f79f35

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624617

Change-Id: Idc7f74ab022786e2c11b6cf4517ec6bbbd60eaf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Avichal Rakesh
2022-06-06 22:44:56 +00:00
committed by Automerger Merge Worker
parent 144e52f561 e2d9f79f35
commit df77db76cf
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/jni/android_media_Utils.cpp
View File

@@ -123,10 +123,15 @@ uint32_t Image_getBlobSize(LockedImage* buffer, bool usingRGBAOverride) {
// First check for BLOB transport header at the end of the buffer // First check for BLOB transport header at the end of the buffer
uint8_t* header = blobBuffer + (width - sizeof(struct camera3_jpeg_blob_v2)); uint8_t* header = blobBuffer + (width - sizeof(struct camera3_jpeg_blob_v2));
struct camera3_jpeg_blob_v2 *blob = (struct camera3_jpeg_blob_v2*)(header);
if (blob->jpeg_blob_id == CAMERA3_JPEG_BLOB_ID || // read camera3_jpeg_blob_v2 from the end of the passed buffer.
blob->jpeg_blob_id == CAMERA3_HEIC_BLOB_ID) { // requires memcpy because 'header' might not be properly aligned.
size = blob->jpeg_size; struct camera3_jpeg_blob_v2 blob;
memcpy(&blob, header, sizeof(struct camera3_jpeg_blob_v2));
if (blob.jpeg_blob_id == CAMERA3_JPEG_BLOB_ID ||
blob.jpeg_blob_id == CAMERA3_HEIC_BLOB_ID) {
size = blob.jpeg_size;
ALOGV("%s: Jpeg/Heic size = %d", __FUNCTION__, size); ALOGV("%s: Jpeg/Heic size = %d", __FUNCTION__, size);
} }