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

glx: Add some missing null checks in glx_pbuffer.c

Browse Source 
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Juha-Pekka Heikkila
2014-02-07 14:44:00 +02:00
committed by Brian Paul
parent 88cad8356e
commit e503609e6f
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/glx/glx_pbuffer.c
View File

@@ -60,7 +60,7 @@ warn_GLX_1_3(Display * dpy, const char *function_name)
{ {
struct glx_display *priv = __glXInitialize(dpy); struct glx_display *priv = __glXInitialize(dpy);
if (priv->minorVersion < 3) { if (priv && priv->minorVersion < 3) {
fprintf(stderr, fprintf(stderr,
"WARNING: Application calling GLX 1.3 function \"%s\" " "WARNING: Application calling GLX 1.3 function \"%s\" "
"when GLX 1.3 is not supported! This is an application bug!\n", "when GLX 1.3 is not supported! This is an application bug!\n",
@@ -91,7 +91,7 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
CARD8 opcode; CARD8 opcode;
int i; int i;
if ((dpy == NULL) || (drawable == 0)) { if ((priv == NULL) || (dpy == NULL) || (drawable == 0)) {
return; return;
} }
@@ -197,6 +197,11 @@ CreateDRIDrawable(Display *dpy, struct glx_config *config,
__GLXDRIdrawable *pdraw; __GLXDRIdrawable *pdraw;
struct glx_screen *psc; struct glx_screen *psc;
if (priv == NULL) {
fprintf(stderr, "failed to create drawable\n");
return GL_FALSE;
}
psc = priv->screens[config->screen]; psc = priv->screens[config->screen];
if (psc->driScreen == NULL) if (psc->driScreen == NULL)
return GL_TRUE; return GL_TRUE;
@@ -226,7 +231,7 @@ DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable)
__GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable); __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable);
XID xid; XID xid;
if (pdraw != NULL) { if (priv != NULL && pdraw != NULL) {
xid = pdraw->xDrawable; xid = pdraw->xDrawable;
(*pdraw->destroyDrawable) (pdraw); (*pdraw->destroyDrawable) (pdraw);
__glxHashDelete(priv->drawHash, drawable); __glxHashDelete(priv->drawHash, drawable);
@@ -294,6 +299,9 @@ GetDrawableAttribute(Display * dpy, GLXDrawable drawable,
} }
priv = __glXInitialize(dpy); priv = __glXInitialize(dpy);
if (priv == NULL)
return 0;
use_glx_1_3 = ((priv->majorVersion > 1) || (priv->minorVersion >= 3)); use_glx_1_3 = ((priv->majorVersion > 1) || (priv->minorVersion >= 3));
*value = 0; *value = 0;
@@ -504,6 +512,9 @@ CreatePbuffer(Display * dpy, struct glx_config *config,
Pixmap pixmap; Pixmap pixmap;
GLboolean glx_1_3 = GL_FALSE; GLboolean glx_1_3 = GL_FALSE;
if (priv == NULL)
return None;
i = 0; i = 0;
if (attrib_list) { if (attrib_list) {
while (attrib_list[i * 2]) while (attrib_list[i * 2])
@@ -593,7 +604,7 @@ DestroyPbuffer(Display * dpy, GLXDrawable drawable)
struct glx_display *priv = __glXInitialize(dpy); struct glx_display *priv = __glXInitialize(dpy);
CARD8 opcode; CARD8 opcode;
if ((dpy == NULL) || (drawable == 0)) { if ((priv == NULL) || (dpy == NULL) || (drawable == 0)) {
return; return;
} }