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

Commit d8cf2ce6 authored by Pauli Nieminen's avatar Pauli Nieminen Committed by Liu Zhiquan
Browse files

egl: Add NULL check for num_config parameter 



EGL 1.5 specification says in 3.4.1:
"An EGL_BAD_PARAMETER error is generated if num config is NULL."

We have to check for the condition and return the required error to
application for eglGetConfigs and eglGetConfigs functions.

Test: refactoring CL.
Change-Id: Ib42709f0420161ce661536394d4c0779bc62be57
Signed-off-by: default avatarPauli Nieminen <pauli.nieminen@linux.intel.com>
Signed-off-by: default avatarLiu Zhiquan <zhiquan.liu@intel.com>
parent b29c82b6

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);

    }