andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix FlushClient to write extraBuf when provided (regression fix)

Browse Source 
In commit:

	commit 092c57ab17
	Author: Adam Jackson <ajax@redhat.com>
	Date:   Fri Jun 17 14:03:01 2011 -0400

	    os: Hide the Connection{In,Out}put implementation details

	    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
	    Signed-off-by: Adam Jackson <ajax@redhat.com>

the check for an empty output buffer was moved from one calling
location into the FlushClient implementation itself. However, this
neglected the possibility that additional data, in the form of
'extraBuf' would be passed to FlushClient from other code paths. If the
output buffer happened to be empty at that time, the extra data would
never be written to the client.

This is fixed by checking the total data to be written, which includes
both pending and extra data, instead of just the pending data.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Keith Packard 2012-10-04 14:42:37 -07:00
parent 8367dd9736
commit d5bf6f95f3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/io.c
View File

@ -862,11 +862,14 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
long notWritten;
long todo;
if (!oco || !oco->count)
if (!oco)
return 0;
written = 0;
padsize = padding_for_int32(extraCount);
notWritten = oco->count + extraCount + padsize;
if (!notWritten)
return 0;
todo = notWritten;
while (notWritten) {
long before = written; /* amount of whole thing written */