Convert AllocXTestDevice to use asprintf

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-10-28 20:19:44 -07:00
parent 08093c25a9
commit e189dbb3e5

View File

@ -608,12 +608,11 @@ int AllocXTestDevice (ClientPtr client, char* name,
DeviceIntPtr master_ptr, DeviceIntPtr master_keybd) DeviceIntPtr master_ptr, DeviceIntPtr master_keybd)
{ {
int retval; int retval;
int len = strlen(name); char *xtestname;
char *xtestname = calloc(len + 7, 1 );
char dummy = 1; char dummy = 1;
strncpy( xtestname, name, len); if (asprintf(&xtestname, "%s XTEST", name) == -1)
strncat( xtestname, " XTEST", 6 ); return BadAlloc;
retval = AllocDevicePair( client, xtestname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE); retval = AllocDevicePair( client, xtestname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE);
if ( retval == Success ){ if ( retval == Success ){