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

Commit 60300f6d authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken

parents 57e629f5 04aed214

opengl/libagl/egl.cpp

+7 −2
Original line number Diff line number Diff line
@@ -1525,8 +1525,13 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list, 
    }



    if (ggl_unlikely(attrib_list==0)) {

        *num_config = 0;

        return EGL_TRUE;

        /*

         * A NULL attrib_list should be treated as though it was an empty

         * one (terminated with EGL_NONE) as defined in

         * section 3.4.1 "Querying Configurations" in the EGL specification.

         */

        static const EGLint dummy = EGL_NONE;

        attrib_list = &dummy;

    }



    int numAttributes = 0;

opengl/libs/EGL/egl.cpp

+6 −4
Original line number Diff line number Diff line
@@ -843,11 +843,13 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list, 
    EGLint patch_index = -1;

    GLint attr;

    size_t size = 0;

    if (attrib_list) {

        while ((attr=attrib_list[size]) != EGL_NONE) {

            if (attr == EGL_CONFIG_ID)

                patch_index = size;

            size += 2;

        }

    }

    if (patch_index >= 0) {

        size += 2; // we need copy the sentinel as well

        EGLint* new_list = (EGLint*)malloc(size*sizeof(EGLint));