frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Xephyr/GL] don't crash when the host returns a NULL server string

This commit is contained in:
Dodji Seketeli 2008-02-21 15:29:27 +01:00
parent f343265a28
commit 437c78ef9f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/kdrive/ephyr/ephyrglxext.c
View File

@ -362,7 +362,7 @@ ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc)
ClientPtr client = a_cl->client; ClientPtr client = a_cl->client;
xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) a_pc; xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) a_pc;
xGLXQueryServerStringReply reply; xGLXQueryServerStringReply reply;
char *server_string=NULL ; char *server_string=NULL, *buf=NULL;
int length=0 ; int length=0 ;
EPHYR_LOG ("enter\n") ; EPHYR_LOG ("enter\n") ;
@ -379,9 +379,15 @@ ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc)
reply.sequenceNumber = client->sequence ; reply.sequenceNumber = client->sequence ;
reply.length = __GLX_PAD (length) >> 2 ; reply.length = __GLX_PAD (length) >> 2 ;
reply.n = length ; reply.n = length ;
buf = xcalloc (reply.length << 2, 1);
if (!buf) {
EPHYR_LOG_ERROR ("failed to allocate string\n;");
return BadAlloc;
}
memcpy (buf, server_string, length);
WriteToClient(client, sz_xGLXQueryServerStringReply, (char*)&reply); WriteToClient(client, sz_xGLXQueryServerStringReply, (char*)&reply);
WriteToClient(client, (int)length, server_string); WriteToClient(client, (int)(reply.length << 2), server_string);
res = Success ; res = Success ;
@ -391,6 +397,10 @@ out:
xfree (server_string) ; xfree (server_string) ;
server_string = NULL; server_string = NULL;
} }
if (buf) {
xfree (buf);
buf = NULL;
}
return res ; return res ;
} }

7
hw/kdrive/ephyr/ephyrhostglx.c
View File

@ -151,6 +151,7 @@ ephyrHostGLXGetStringFromServer (int a_screen_number,
{ {
Bool is_ok=FALSE ; Bool is_ok=FALSE ;
Display *dpy = hostx_get_display () ; Display *dpy = hostx_get_display () ;
int default_screen = DefaultScreen (dpy);
xGLXGenericGetStringReq *req=NULL; xGLXGenericGetStringReq *req=NULL;
xGLXSingleReply reply; xGLXSingleReply reply;
int length=0, numbytes=0, major_opcode=0, get_string_op=0; int length=0, numbytes=0, major_opcode=0, get_string_op=0;
@ -188,13 +189,17 @@ ephyrHostGLXGetStringFromServer (int a_screen_number,
GetReq (GLXGenericGetString, req); GetReq (GLXGenericGetString, req);
req->reqType = major_opcode; req->reqType = major_opcode;
req->glxCode = get_string_op; req->glxCode = get_string_op;
req->for_whom = DefaultScreen (dpy); req->for_whom = default_screen;
req->name = a_string_name; req->name = a_string_name;
_XReply (dpy, (xReply *)&reply, 0, False); _XReply (dpy, (xReply *)&reply, 0, False);
length = reply.length * 4; length = reply.length * 4;
if (!length) {
numbytes = 0;
} else {
numbytes = reply.size; numbytes = reply.size;
}
EPHYR_LOG ("going to get a string of size:%d\n", numbytes) ; EPHYR_LOG ("going to get a string of size:%d\n", numbytes) ;
*a_string = (char *) Xmalloc (numbytes +1); *a_string = (char *) Xmalloc (numbytes +1);