egl: Display may be NULL in _eglLookup*.

This fixes several NULL dereferences.

diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h
index ca63c40d3d78b26468638bc58b61eaa4fd4706f8..0ad58cf473d4d9d0a0881bdc735db17904e7aad1 100644 (file)
--- a/src/egl/main/eglconfig.h
+++ b/src/egl/main/eglconfig.h
@@ -117,7 +117,7 @@ static INLINE _EGLConfig *
 _eglLookupConfig(EGLConfig config, _EGLDisplay *dpy)
 {
    _EGLConfig *conf = (_EGLConfig *) config;
-   if (!_eglCheckConfigHandle(config, dpy))
+   if (!dpy || !_eglCheckConfigHandle(config, dpy))
       conf = NULL;
    return conf;
 }

diff --git a/src/egl/main/eglmode.c b/src/egl/main/eglmode.c
index 37594cdb42d6d058cd00f410e268781863935dd1..ed107d5d7a71ace28dd51d245fc5af7c0a183566 100644 (file)
--- a/src/egl/main/eglmode.c
+++ b/src/egl/main/eglmode.c
@@ -25,7 +25,7 @@ _eglLookupMode(EGLModeMESA mode, _EGLDisplay *disp)
 {
    EGLint scrnum;
 
-   if (!disp->Screens)
+   if (!disp || !disp->Screens)
       return NULL;
 
    /* loop over all screens on the display */

diff --git a/src/egl/main/eglscreen.c b/src/egl/main/eglscreen.c
index 8b8966f3ffd2ba3a2c07699b5a8198c7eebff547..9e39335cc7a2c1a0eaa5ebed815e31c7dffb6cfb 100644 (file)
--- a/src/egl/main/eglscreen.c
+++ b/src/egl/main/eglscreen.c
@@ -69,7 +69,7 @@ _eglLookupScreen(EGLScreenMESA screen, _EGLDisplay *display)
 {
    EGLint i;
 
-   if (!display->Screens)
+   if (!display || !display->Screens)
       return NULL;
 
    for (i = 0; i < display->Screens->Size; i++) {