From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 3 Feb 2010 04:35:57 +0000 (+0800)
Subject: egl: Fix a potential segfault in driver suffix matching.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e6a964411ea3e1d7dc4c86c314e326e3be2b0eb;p=mesa.git

egl: Fix a potential segfault in driver suffix matching.

The driver suffix might be NULL on some platforms.  Perform the matching
only when there is a suffix.
---

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 8e623a071e0..d58991aa4c4 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -347,9 +347,11 @@ _eglPreloadPattern(const char *dir, size_t len, void *preload_data)
       if (strncmp(dirent->d_name, prefix, prefix_len) != 0)
          continue;
       /* match the suffix */
-      p = dirent->d_name + dirent_len - suffix_len;
-      if (p < dirent->d_name || strcmp(p, suffix) != 0)
-         continue;
+      if (suffix) {
+         p = dirent->d_name + dirent_len - suffix_len;
+         if (p < dirent->d_name || strcmp(p, suffix) != 0)
+            continue;
+      }
 
       /* make a full path and load the driver */
       if (len + dirent_len + 1 <= sizeof(path)) {