From dc0a06319e1040b2912af15b906aba66ce03e07d Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 26 Apr 2011 20:14:29 +0000 Subject: [PATCH] Generate the network byte order version of the window size structure in a temporary variable on the stack and then copy that into the output buffer so that the htons() conversions use aligned accesses. MFC after: 1 month --- usr.bin/rlogin/rlogin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index 328ff5f53b42..4d1f7b0e5c66 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -484,18 +484,18 @@ sigwinch(int signo __unused) void sendwindow(void) { - struct winsize *wp; + struct winsize ws; char obuf[4 + sizeof (struct winsize)]; - wp = (struct winsize *)(obuf+4); obuf[0] = 0377; obuf[1] = 0377; obuf[2] = 's'; obuf[3] = 's'; - wp->ws_row = htons(winsize.ws_row); - wp->ws_col = htons(winsize.ws_col); - wp->ws_xpixel = htons(winsize.ws_xpixel); - wp->ws_ypixel = htons(winsize.ws_ypixel); + ws.ws_row = htons(winsize.ws_row); + ws.ws_col = htons(winsize.ws_col); + ws.ws_xpixel = htons(winsize.ws_xpixel); + ws.ws_ypixel = htons(winsize.ws_ypixel); + bcopy(&ws, obuf + 4, sizeof(ws)); (void)write(rem, obuf, sizeof(obuf)); }