diff options
author | Colin Watson <cjwatson@debian.org> | 2015-08-19 17:00:17 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 17:00:17 +0100 |
commit | 544df7a04ae5b5c1fc30be7c445ad685d7a02dc9 (patch) | |
tree | 33d2a87dd50fe5894ac6ec4579c83401b7ab00a4 /scp.c | |
parent | baccdb349b31c47cd76fb63211f754ed33a9707e (diff) | |
parent | 7de4b03a6e4071d454b72927ffaf52949fa34545 (diff) |
Import openssh_6.9p1.orig.tar.gz
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.181 2015/01/16 06:40:12 deraadt Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -1333,7 +1333,7 @@ allocbuf(BUF *bp, int fd, int blksize) | |||
1333 | if (bp->buf == NULL) | 1333 | if (bp->buf == NULL) |
1334 | bp->buf = xmalloc(size); | 1334 | bp->buf = xmalloc(size); |
1335 | else | 1335 | else |
1336 | bp->buf = xrealloc(bp->buf, 1, size); | 1336 | bp->buf = xreallocarray(bp->buf, 1, size); |
1337 | memset(bp->buf, 0, size); | 1337 | memset(bp->buf, 0, size); |
1338 | bp->cnt = size; | 1338 | bp->cnt = size; |
1339 | return (bp); | 1339 | return (bp); |