| commit | 9c2a2e6d11fdaa9fcfd2402db4e624d5ef3dc4cd | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Jan 24 18:08:29 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Jan 24 18:08:29 2023 +0000 |
| tree | a33ca852fc8605d38fab9dcbf9903b8fb49e4d8a | |
| parent | 43940b69a321f05d5e23c4672fd239c5ec4cf58f [diff] | |
| parent | f76106234412b0e1f3d91310138c4cb1dbe45f22 [diff] |
Merge cherrypicks of ['ag/20758566'] into sc-platform-release. Change-Id: I025dece295312eaf52d86b4b6eccce6bca254c0b
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) {