diff options
| author | 2023-08-11 23:33:39 +0000 | |
|---|---|---|
| committer | 2023-08-11 23:33:39 +0000 | |
| commit | e36d57bc652451d1682aa38b6644864e8fb43aaa (patch) | |
| tree | 45a6fde26fee12600336f7f7a41de912d74b601a | |
| parent | 323d3e4d0533992b1f59bb925a7f64b9b83bbf4e (diff) | |
| parent | 64b1cfe27c6187bef1cdb1bea571233b318c02ff (diff) | |
Merge "Vulkan: Avoid buffer overflow by ignoring duplicate extensions" into main am: 64b1cfe27c
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2702989
Change-Id: I704dd4bb540503a7835ff1c49b410e07daf6808f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index a99355f047..f92078d8dc 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -747,6 +747,17 @@ void CreateInfoWrapper::FilterExtension(const char* name) { if (strcmp(name, props.extensionName) != 0) continue; + // Ignore duplicate extensions (see: b/288929054) + bool duplicate_entry = false; + for (uint32_t j = 0; j < filter.name_count; j++) { + if (strcmp(name, filter.names[j]) == 0) { + duplicate_entry = true; + break; + } + } + if (duplicate_entry == true) + continue; + filter.names[filter.name_count++] = name; if (ext_bit != ProcHook::EXTENSION_UNKNOWN) { if (ext_bit == ProcHook::ANDROID_native_buffer) |