Changeset 62201 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Jul 12, 2016 2:14:55 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: improve preventing loading of OpenGL libraries by the X server. We support client-side OpenGL, but not server-side. Now we intercept functions that the X server will call and check for it rather than trying to overwrite the libraries in memory with the Mesa OpenGL ones. Also fix locating the Mesa libraries. Hopefully this can be removed altogether, but not just before the release.

File:

• trunk/src/VBox/Additions/common/crOpenGL/egl.c (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/egl.c

@@ -29 +29 @@
 #include <GL/glx.h>
 #include <X11/Xlib.h>
+
+#include <stdlib.h>
 
 /*******************************************************************************
@@ -133 +135 @@
     Display *pDisplay;
     int rc, cError, cEvent, cMajor, cMinor;
-
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_NO_DISPLAY;
     rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
     if (RT_FAILURE(rc))
@@ -164 +170 @@
 DECLEXPORT(EGLBoolean) eglInitialize (EGLDisplay hDisplay, EGLint *pcMajor, EGLint *pcMinor)
 {
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_FALSE;
     if (!VALID_PTR(hDisplay))
         return setEGLError(EGL_BAD_DISPLAY);
@@ -730 +741 @@
 DECLEXPORT(EGLBoolean) eglBindAPI(EGLenum enmApi)
 {
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_FALSE;
     return enmApi == EGL_OPENGL_API ? clearEGLError() : setEGLError(EGL_BAD_PARAMETER);
 }