Set padding bytes to 0 in WriteToClient

commit bed610fcae41ddfe21fa9acde599b17d1d15f5d1 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Jul 9 19:12:44 2012 -0700 Set padding bytes to 0 in WriteToClient Clear them out when needed instead of leaving whatever values were present in previously sent messages. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Set padding bytes to 0 in WriteToClient
f9123570 · Alan Coopersmith · Mike Gabriel · 2ecd2a00 · f9123570
Commit f9123570 authored Feb 14, 2017 by Alan Coopersmith Committed by Mike Gabriel Mar 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

io.c nx-X11/programs/Xserver/os/io.c +5 -1

No files found.
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -1003,7 +1003,11 @@ WriteToClient (ClientPtr who, int count, const void *__buf)
    NewOutputPending = TRUE;
    FD_SET(oc->fd, &OutputPending);
    memmove((char *)oco->buf + oco->count, buf, count);
-    oco->count += count + padBytes;
+    oco->count += count;
+    if (padBytes) {
+	memset(oco->buf + oco->count, '\0', padBytes);
+	oco->count += padBytes;
+    }
    return(count);
 }