OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: check for buffer overflow *before* corrupting our memory

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Eric Engestrom
2018-08-16 15:31:55 +01:00
parent eb6b41749b
commit aa78b29eba
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/egl/main/eglapi.c
View File

@@ -538,19 +538,30 @@ _eglCreateExtensionsString(_EGLDisplay *dpy)
static void static void
_eglCreateAPIsString(_EGLDisplay *dpy) _eglCreateAPIsString(_EGLDisplay *dpy)
{ {
#define addstr(str) \
{ \
const size_t old_len = strlen(dpy->ClientAPIsString); \
const size_t add_len = sizeof(str); \
const size_t max_len = sizeof(dpy->ClientAPIsString) - 1; \
if (old_len + add_len <= max_len) \
strcat(dpy->ClientAPIsString, str " "); \
else \
assert(!"dpy->ClientAPIsString is not large enough"); \
}
if (dpy->ClientAPIs & EGL_OPENGL_BIT) if (dpy->ClientAPIs & EGL_OPENGL_BIT)
strcat(dpy->ClientAPIsString, "OpenGL "); addstr("OpenGL");
if (dpy->ClientAPIs & EGL_OPENGL_ES_BIT || if (dpy->ClientAPIs & EGL_OPENGL_ES_BIT ||
dpy->ClientAPIs & EGL_OPENGL_ES2_BIT || dpy->ClientAPIs & EGL_OPENGL_ES2_BIT ||
dpy->ClientAPIs & EGL_OPENGL_ES3_BIT_KHR) { dpy->ClientAPIs & EGL_OPENGL_ES3_BIT_KHR) {
strcat(dpy->ClientAPIsString, "OpenGL_ES "); addstr("OpenGL_ES");
} }
if (dpy->ClientAPIs & EGL_OPENVG_BIT) if (dpy->ClientAPIs & EGL_OPENVG_BIT)
strcat(dpy->ClientAPIsString, "OpenVG "); addstr("OpenVG");
assert(strlen(dpy->ClientAPIsString) < sizeof(dpy->ClientAPIsString)); #undef addstr
} }
static void static void