xserver: Branch 'master'
Jon TURNEY
jturney at kemper.freedesktop.org
Thu Jan 15 06:24:29 PST 2009
glx/single2.c | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit c745db1674c3cb55249c9eb6e74939b74c42409c
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Mon Jan 5 13:52:45 2009 +0000
GLX: Avoid a crash when we have an uninitialized GL context
If the GL dispatch table pointer points to glapi_noop_table,
(due to some kind of GL initialization failure), DoGetString(GL_VERSION)
(for example as invoked by glxinfo) will crash as it tries to
do atof() on the null pointer returned by the noop dispatch function
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
diff --git a/glx/single2.c b/glx/single2.c
index 0ca808c..50a59ed 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -335,6 +335,9 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
string = (const char *) CALL_GetString( GET_DISPATCH(), (name) );
client = cl->client;
+ if (string == NULL)
+ string = "";
+
/*
** Restrict extensions to those that are supported by both the
** implementation and the connection. That is, return the
More information about the xorg-commit
mailing list