diff options
| author | Damien Miller <djm@mindrot.org> | 2013-09-14 01:49:43 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-09-14 01:49:43 +0200 |
| commit | 13840e0103946982cee2a05c40697be7e57dca41 (patch) | |
| tree | 4951a14d898e6023604ea76e4d18dc4b935ec89b /channels.c | |
| parent | - djm@cvs.openbsd.org 2013/09/12 01:41:12 (diff) | |
| download | openssh-13840e0103946982cee2a05c40697be7e57dca41.tar.xz openssh-13840e0103946982cee2a05c40697be7e57dca41.zip | |
- djm@cvs.openbsd.org 2013/09/13 06:54:34
[channels.c]
avoid unaligned access in code that reused a buffer to send a
struct in_addr in a reply; simpler just use use buffer_put_int();
from portable; spotted by and ok dtucker@
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 281df3802..698fa6da2 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.324 2013/07/12 00:19:58 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.325 2013/09/13 06:54:34 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1239,11 +1239,10 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset) s5_rsp.command = SSH_SOCKS5_SUCCESS; s5_rsp.reserved = 0; /* ignored */ s5_rsp.atyp = SSH_SOCKS5_IPV4; - ((struct in_addr *)&dest_addr)->s_addr = INADDR_ANY; dest_port = 0; /* ignored */ buffer_append(&c->output, &s5_rsp, sizeof(s5_rsp)); - buffer_append(&c->output, &dest_addr, sizeof(struct in_addr)); + buffer_put_int(&c->output, ntohl(INADDR_ANY)); /* bind address */ buffer_append(&c->output, &dest_port, sizeof(dest_port)); return 1; } |