Mesa (master): targets/egl: Fix crashes from loading invalid modules.

Chia-I Wu olv at kemper.freedesktop.org
Fri Sep 10 08:03:53 UTC 2010


Module: Mesa
Branch: master
Commit: 67660ccee969e0024ddec51f84c6e75de3f675d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67660ccee969e0024ddec51f84c6e75de3f675d5

Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Sep 10 16:01:37 2010 +0800

targets/egl: Fix crashes from loading invalid modules.

Be defensive.

---

 src/gallium/targets/egl/egl.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/gallium/targets/egl/egl.c b/src/gallium/targets/egl/egl.c
index fb5bfd4..786d5d1 100644
--- a/src/gallium/targets/egl/egl.c
+++ b/src/gallium/targets/egl/egl.c
@@ -184,9 +184,6 @@ load_pipe_module(struct pipe_module *pmod, const char *name)
       }
    }
 
-   if (!pmod->drmdd)
-      pmod->name = NULL;
-
    return (pmod->drmdd != NULL);
 }
 
@@ -305,7 +302,7 @@ static struct pipe_screen *
 create_drm_screen(const char *name, int fd)
 {
    struct pipe_module *pmod = get_pipe_module(name);
-   return (pmod && pmod->drmdd->create_screen) ?
+   return (pmod && pmod->drmdd && pmod->drmdd->create_screen) ?
       pmod->drmdd->create_screen(fd) : NULL;
 }
 




More information about the mesa-commit mailing list