- 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@

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 46bb468e0..191e525b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/scp.c b/scp.c
index 868a8eb3d..9b0a23f0e 100644
--- a/scp.c
+++ b/scp.c
@@ -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);
 }