diff options
author | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
commit | b856a4573162fbc9ddf1c38fd82b6c728c310d1b (patch) | |
tree | b2a4ad7a06e845ba72a87d2beedfbbcbb7aeb5bb /crypto/openssh/scp.c | |
parent | 76107b08804f309434efce7480edc2bbd15e1bf7 (diff) | |
parent | f8195792ec11c7b20879183ea72e1495f0870617 (diff) | |
download | FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.zip FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.tar.gz |
Upgrade to OpenSSH 6.9p1.
Diffstat (limited to 'crypto/openssh/scp.c')
-rw-r--r-- | crypto/openssh/scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/scp.c b/crypto/openssh/scp.c index 887b014..593fe89 100644 --- a/crypto/openssh/scp.c +++ b/crypto/openssh/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.181 2015/01/16 06:40:12 deraadt Exp $ */ +/* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -1333,7 +1333,7 @@ allocbuf(BUF *bp, int fd, int blksize) if (bp->buf == NULL) bp->buf = xmalloc(size); else - bp->buf = xrealloc(bp->buf, 1, size); + bp->buf = xreallocarray(bp->buf, 1, size); memset(bp->buf, 0, size); bp->cnt = size; return (bp); |