[PATCH xserver] use xcb struct in render

Alan Coopersmith alan.coopersmith at oracle.com
Sun Jan 11 10:34:28 PST 2015


On 01/11/15 02:30 AM, Julien Cristau wrote:
>> @@ -276,11 +277,11 @@ ProcRenderQueryVersion(ClientPtr client)
>>
>>       REQUEST(xRenderQueryVersionReq);
>>
>> -    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
>> -
>>       pRenderClient->major_version = stuff->majorVersion;
>>       pRenderClient->minor_version = stuff->minorVersion;
>>
>> +    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
>> +
>>       if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
>>           (SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) {
>>           rep.majorVersion = stuff->majorVersion;
>
> this is wrong, you can't access stuff before making sure it's within
> bounds.
>
> [...]
>> @@ -1995,7 +1996,7 @@ static int
>>   SProcRenderQueryVersion(ClientPtr client)
>>   {
>>       REQUEST(xRenderQueryVersionReq);
>> -    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
>> +
>>       swaps(&stuff->length);
>>       swapl(&stuff->majorVersion);
>>       swapl(&stuff->minorVersion);
>
> again this is wrong (ditto for a number of others).

Those both seem like failing to merge with the REQUEST_SIZE patches pushed
in early December - Jaya probably started working on her changes before that
and needs to update to avoid reverting them.


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc


More information about the xorg-devel mailing list