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

Commit 84067b39 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "egl: Add NULL check for num_config parameter" am: 64990fc0 am: ccaf6bf3 

am: 68d96292

Change-Id: Icde1d5dc8ca191b752097e85cfb7e94857bcb27b
parents d956830c 68d96292

opengl/libagl/egl.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1459,6 +1459,9 @@ EGLBoolean eglGetConfigs( EGLDisplay dpy, 
    if (egl_display_t::is_valid(dpy) == EGL_FALSE)

        return setError(EGL_BAD_DISPLAY, EGL_FALSE);



    if (ggl_unlikely(num_config==NULL))

        return setError(EGL_BAD_PARAMETER, EGL_FALSE);



    GLint numConfigs = NELEM(gConfigs);

    if (!configs) {

        *num_config = numConfigs;
@@ -1479,7 +1482,7 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list, 
    if (egl_display_t::is_valid(dpy) == EGL_FALSE)

        return setError(EGL_BAD_DISPLAY, EGL_FALSE);



    if (ggl_unlikely(num_config==0)) {

    if (ggl_unlikely(num_config==NULL)) {

        return setError(EGL_BAD_PARAMETER, EGL_FALSE);

    }