diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-12 17:49:48 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-12 17:49:48 +0000 |
commit | 5fccbc233957671774d925c8dc6694c7236b56a0 (patch) | |
tree | 717173e96d29e6335babe7adda8aba0c5ee5d26d | |
parent | 14f31ab947acd4c0b1698195782b904e0d6c7686 (diff) |
- markus@cvs.openbsd.org 2001/08/29 20:44:03
[scp.c]
clear the malloc'd buffer, otherwise source() will leak malloc'd
memory; ok theo@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | scp.c | 3 |
2 files changed, 7 insertions, 2 deletions
@@ -42,6 +42,10 @@ - markus@cvs.openbsd.org 2001/08/28 15:39:48 [ssh.1 ssh.c] allow: ssh -F configfile host + - markus@cvs.openbsd.org 2001/08/29 20:44:03 + [scp.c] + clear the malloc'd buffer, otherwise source() will leak malloc'd + memory; ok theo@ 20010815 - (bal) Fixed stray code in readconf.c that went in by mistake. @@ -6365,4 +6369,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1497 2001/09/12 17:48:04 mouring Exp $ +$Id: ChangeLog,v 1.1498 2001/09/12 17:49:48 mouring Exp $ @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.80 2001/08/13 23:38:54 stevesk Exp $"); +RCSID("$OpenBSD: scp.c,v 1.81 2001/08/29 20:44:03 markus Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -1049,6 +1049,7 @@ allocbuf(bp, fd, blksize) bp->buf = xmalloc(size); else bp->buf = xrealloc(bp->buf, size); + memset(bp->buf, 0, size); bp->cnt = size; return (bp); } |