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

Commit 65b688e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Ian Elliott
Browse files

[conflict] Merge "Vulkan: Avoid buffer overflow by ignoring duplicate... 

[conflict] Merge "Vulkan: Avoid buffer overflow by ignoring duplicate extensions" into main am: 64b1cfe2 am: e36d57bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2702989



Change-Id: I6403163b14d62b50232d1197ecb2b14e946efe13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62a951a8 e36d57bc

vulkan/libvulkan/driver.cpp

+11 −0
Original line number Original line Diff line number Diff line
@@ -763,6 +763,17 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            continue;

            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;

        filter.names[filter.name_count++] = name;

        if (ext_bit != ProcHook::EXTENSION_UNKNOWN) {

        if (ext_bit != ProcHook::EXTENSION_UNKNOWN) {

            if (ext_bit == ProcHook::ANDROID_native_buffer)

            if (ext_bit == ProcHook::ANDROID_native_buffer)