projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glx: Fix use after free in drisw error path
[mesa.git]
/
src
/
glx
/
single2.c
diff --git
a/src/glx/single2.c
b/src/glx/single2.c
index a1461956b993e3d392f4d5adc5209c2abffa533a..318d18e555441951d814e375949e674b77a1ed59 100644
(file)
--- a/
src/glx/single2.c
+++ b/
src/glx/single2.c
@@
-156,7
+156,7
@@
__indirect_glGetError(void)
* On success \c GL_TRUE is returned. Otherwise, \c GL_FALSE is returned.
*/
static GLboolean
* On success \c GL_TRUE is returned. Otherwise, \c GL_FALSE is returned.
*/
static GLboolean
-get_client_data(
__GLX
context * gc, GLenum cap, GLintptr * data)
+get_client_data(
struct glx_
context * gc, GLenum cap, GLintptr * data)
{
GLboolean retval = GL_TRUE;
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
{
GLboolean retval = GL_TRUE;
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
@@
-646,7
+646,7
@@
version_from_string(const char *ver, int *major_version, int *minor_version)
const GLubyte *
__indirect_glGetString(GLenum name)
{
const GLubyte *
__indirect_glGetString(GLenum name)
{
-
__GLX
context *gc = __glXGetCurrentContext();
+
struct glx_
context *gc = __glXGetCurrentContext();
Display *dpy = gc->currentDpy;
GLubyte *s = NULL;
Display *dpy = gc->currentDpy;
GLubyte *s = NULL;
@@
-837,7
+837,7
@@
__indirect_glIsEnabled(GLenum cap)
void
__indirect_glGetPointerv(GLenum pname, void **params)
{
void
__indirect_glGetPointerv(GLenum pname, void **params)
{
-
__GLX
context *gc = __glXGetCurrentContext();
+
struct glx_
context *gc = __glXGetCurrentContext();
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
Display *dpy = gc->currentDpy;
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
Display *dpy = gc->currentDpy;
@@
-885,7
+885,7
@@
GLboolean
__indirect_glAreTexturesResident(GLsizei n, const GLuint * textures,
GLboolean * residences)
{
__indirect_glAreTexturesResident(GLsizei n, const GLuint * textures,
GLboolean * residences)
{
-
__GLX
context *const gc = __glXGetCurrentContext();
+
struct glx_
context *const gc = __glXGetCurrentContext();
Display *const dpy = gc->currentDpy;
GLboolean retval = (GLboolean) 0;
const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
Display *const dpy = gc->currentDpy;
GLboolean retval = (GLboolean) 0;
const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
@@
-941,14
+941,14
@@
GLboolean
glAreTexturesResidentEXT(GLsizei n, const GLuint * textures,
GLboolean * residences)
{
glAreTexturesResidentEXT(GLsizei n, const GLuint * textures,
GLboolean * residences)
{
-
__GLX
context *const gc = __glXGetCurrentContext();
+
struct glx_
context *const gc = __glXGetCurrentContext();
if (gc->isDirect) {
return CALL_AreTexturesResident(GET_DISPATCH(),
(n, textures, residences));
}
else {
if (gc->isDirect) {
return CALL_AreTexturesResident(GET_DISPATCH(),
(n, textures, residences));
}
else {
-
__GLX
context *const gc = __glXGetCurrentContext();
+
struct glx_
context *const gc = __glXGetCurrentContext();
Display *const dpy = gc->currentDpy;
GLboolean retval = (GLboolean) 0;
const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
Display *const dpy = gc->currentDpy;
GLboolean retval = (GLboolean) 0;
const GLuint cmdlen = 4 + __GLX_PAD((n * 4));