summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-19 17:00:17 +0100
committerColin Watson <cjwatson@debian.org>2015-08-19 17:40:32 +0100
commit927d0032b865f05679d3cc052bc13cb0e6490283 (patch)
tree69f782deb79182f26069ff41e9539f17e6e44912 /scp.c
parentd35c65e77ab6a6a95fefa2c852827ba08e507f0b (diff)
parent810eecd6b2e03770f21e46b5cb8ce8c7fcd46da8 (diff)
New upstream release (6.9p1).
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index afa4a2fb0..e39294e9c 100644
--- a/scp.c
+++ b/scp.c
@@ -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).
@@ -1341,7 +1341,7 @@ allocbuf(BUF *bp, int fd, int blksize)
1341 if (bp->buf == NULL) 1341 if (bp->buf == NULL)
1342 bp->buf = xmalloc(size); 1342 bp->buf = xmalloc(size);
1343 else 1343 else
1344 bp->buf = xrealloc(bp->buf, 1, size); 1344 bp->buf = xreallocarray(bp->buf, 1, size);
1345 memset(bp->buf, 0, size); 1345 memset(bp->buf, 0, size);
1346 bp->cnt = size; 1346 bp->cnt = size;
1347 return (bp); 1347 return (bp);