From: Kristian Høgsberg <krh@redhat.com>
Date: Sun, 9 Mar 2008 20:21:29 +0000 (-0400)
Subject: libGL: Fall back to DEFAULT_DRIVER_DIR properly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03db9c8acb83f7072681876ce5e8d73e1ec922e9;p=mesa.git

libGL: Fall back to DEFAULT_DRIVER_DIR properly.

After commit 6fd82f6fbd208dc7b1839ea408a5fb28589ee622, we would
overwrite the libPath default value with NULL if libGL was running
non-setuid and none of the env vars were set.

Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for spotting it.
---

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index fc1c91d31f3..6c915d800e0 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -145,13 +145,14 @@ static void *OpenDriver(const char *driverName)
    /* Attempt to make sure libGL symbols will be visible to the driver */
    glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);
 
-   libPaths = DEFAULT_DRIVER_DIR;
    if (geteuid() == getuid()) {
       /* don't allow setuid apps to use LIBGL_DRIVERS_PATH */
       libPaths = getenv("LIBGL_DRIVERS_PATH");
       if (!libPaths)
          libPaths = getenv("LIBGL_DRIVERS_DIR"); /* deprecated */
    }
+   if (libPaths == NULL)
+       libPaths = DEFAULT_DRIVER_DIR;
 
    handle = NULL;
    for (p = libPaths; *p; p = next) {