diff options
| -rw-r--r-- | src/glx/x11/indirect.c | 6 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index 3468f0d8b70..d2189090991 100644 --- a/src/glx/x11/indirect.c +++ b/src/glx/x11/indirect.c @@ -273,7 +273,7 @@ __indirect_glCallLists(GLsizei n, GLenum type, const GLvoid * lists) __GLXcontext * const gc = __glXGetCurrentContext(); const GLuint compsize = __glCallLists_size(type); const GLuint cmdlen = 12 + __GLX_PAD((compsize * n)); - if (__builtin_expect(gc->currentDpy != NULL, 1)) { + if (__builtin_expect((n >= 0) && (gc->currentDpy != NULL), 1)) { if (cmdlen <= gc->maxSmallRenderCommandSize) { if ( (gc->pc + cmdlen) > gc->bufEnd ) { (void) __glXFlushRenderBuffer(gc, gc->pc); @@ -4030,7 +4030,7 @@ __indirect_glGenTextures(GLsizei n, GLuint * textures) __GLXcontext * const gc = __glXGetCurrentContext(); Display * const dpy = gc->currentDpy; const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { + if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { GLubyte const * pc = setup_single_request(gc, X_GLsop_GenTextures, cmdlen); (void) memcpy((void *)(pc + 0), (void *)(&n), 4); (void) read_reply(dpy, 4, textures, GL_TRUE); @@ -5285,7 +5285,7 @@ __indirect_glGenTexturesEXT(GLsizei n, GLuint * textures) __GLXcontext * const gc = __glXGetCurrentContext(); Display * const dpy = gc->currentDpy; const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { + if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { GLubyte const * pc = setup_vendor_request(gc, X_GLXVendorPrivateWithReply, X_GLvop_GenTexturesEXT, cmdlen); (void) memcpy((void *)(pc + 0), (void *)(&n), 4); (void) read_reply(dpy, 4, textures, GL_TRUE); diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index fe1aa42332e..5f9c83ce475 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -844,7 +844,7 @@ glx: </function> <function name="CallLists" offset="3"> - <param name="n" type="GLsizei"/> + <param name="n" type="GLsizei" counter="true"/> <param name="type" type="GLenum"/> <param name="lists" type="const GLvoid *" variable_param="type" count="n"/> <glx rop="2" large="true"/> @@ -2988,7 +2988,7 @@ glx: </function> <function name="GenTextures" offset="328"> - <param name="n" type="GLsizei"/> + <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="GLuint *" output="true"/> <glx sop="145" always_array="true"/> </function> @@ -7026,7 +7026,7 @@ glx: </function> <function name="GenTexturesEXT" offset="440"> - <param name="n" type="GLsizei"/> + <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="GLuint *" output="true"/> <glx vendorpriv="13" always_array="true"/> </function> |