From: Chia-I Wu <olv@lunarg.com>
Date: Fri, 10 Sep 2010 08:01:37 +0000 (+0800)
Subject: targets/egl: Fix crashes from loading invalid modules.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67660ccee969e0024ddec51f84c6e75de3f675d5;p=mesa.git

targets/egl: Fix crashes from loading invalid modules.

Be defensive.
---

diff --git a/src/gallium/targets/egl/egl.c b/src/gallium/targets/egl/egl.c
index fb5bfd4061c..786d5d1105e 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;
 }