commit | 7b309bfbcae7a86df6698703fcf28c0a44139474 | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Jan 25 06:32:35 2023 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Jan 25 06:32:35 2023 +0000 |
tree | ea3397d56f7749432be1c98485e49a9830966204 | |
parent | 03d56d03eecf9885c88651f74d08ab2eefa2e88c [diff] | |
parent | 53b32f05d518ad18bc490996478c98fdac783847 [diff] |
Merge cherrypicks of ['ag/20757344'] into sc-v2-platform-release. Change-Id: I5cdd383803f43b71d2a27f1e9cdac70b6b512f60
diff --git a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp index e55bdc0..bbbd03e 100644 --- a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp +++ b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
@@ -64,6 +64,11 @@ } HandleSyncMem *o = static_cast<HandleSyncMem*>(handle); + if (o->size() < sizeof(C2SyncVariables)) { + android_errorWriteLog(0x534e4554, "240140929"); + return nullptr; + } + void *ptr = mmap(NULL, o->size(), PROT_READ | PROT_WRITE, MAP_SHARED, o->memFd(), 0); if (ptr == MAP_FAILED) {