diff options
author | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
commit | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch) | |
tree | 3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/hw/kdrive/ephyr/ephyrdriext.c | |
parent | af64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff) | |
parent | 87559ccfc67a98a75fa8068066871c35caa88e30 (diff) | |
download | vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2 vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrdriext.c')
-rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c index af411848f..d730e7fd2 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c @@ -682,7 +682,7 @@ ProcXF86DRIOpenConnection (register ClientPtr client) {
xXF86DRIOpenConnectionReply rep;
drm_handle_t hSAREA;
- char* busIdString;
+ char* busIdString = NULL;
REQUEST(xXF86DRIOpenConnectionReq);
REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);
@@ -716,6 +716,7 @@ ProcXF86DRIOpenConnection (register ClientPtr client) WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
if (rep.busIdStringLength)
WriteToClient(client, rep.busIdStringLength, busIdString);
+ free(busIdString);
EPHYR_LOG ("leave\n") ;
return Success;
}
|