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 @@ | |||
42 | - markus@cvs.openbsd.org 2001/08/28 15:39:48 | 42 | - markus@cvs.openbsd.org 2001/08/28 15:39:48 |
43 | [ssh.1 ssh.c] | 43 | [ssh.1 ssh.c] |
44 | allow: ssh -F configfile host | 44 | allow: ssh -F configfile host |
45 | - markus@cvs.openbsd.org 2001/08/29 20:44:03 | ||
46 | [scp.c] | ||
47 | clear the malloc'd buffer, otherwise source() will leak malloc'd | ||
48 | memory; ok theo@ | ||
45 | 49 | ||
46 | 20010815 | 50 | 20010815 |
47 | - (bal) Fixed stray code in readconf.c that went in by mistake. | 51 | - (bal) Fixed stray code in readconf.c that went in by mistake. |
@@ -6365,4 +6369,4 @@ | |||
6365 | - Wrote replacements for strlcpy and mkdtemp | 6369 | - Wrote replacements for strlcpy and mkdtemp |
6366 | - Released 1.0pre1 | 6370 | - Released 1.0pre1 |
6367 | 6371 | ||
6368 | $Id: ChangeLog,v 1.1497 2001/09/12 17:48:04 mouring Exp $ | 6372 | $Id: ChangeLog,v 1.1498 2001/09/12 17:49:48 mouring Exp $ |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.80 2001/08/13 23:38:54 stevesk Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.81 2001/08/29 20:44:03 markus Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -1049,6 +1049,7 @@ allocbuf(bp, fd, blksize) | |||
1049 | bp->buf = xmalloc(size); | 1049 | bp->buf = xmalloc(size); |
1050 | else | 1050 | else |
1051 | bp->buf = xrealloc(bp->buf, size); | 1051 | bp->buf = xrealloc(bp->buf, size); |
1052 | memset(bp->buf, 0, size); | ||
1052 | bp->cnt = size; | 1053 | bp->cnt = size; |
1053 | return (bp); | 1054 | return (bp); |
1054 | } | 1055 | } |