[openssh-commits] [openssh] 02/04: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1527d9f61e6d50f6c2b4a3fa5b45829034b1b0b1
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jun 1 06:59:21 2017 +0000

    upstream commit
    
    no need to bzero allocated space now that we use use
    recallocarray; ok deraadt@
    
    Upstream-ID: 53333c62ccf97de60b8cb570608c1ba5ca5803c8
---
 bitmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitmap.c b/bitmap.c
index e8320d8c..5089b040 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -87,10 +87,10 @@ reserve(struct bitmap *b, u_int n)
 		return -1; /* invalid */
 	nlen = (n / BITMAP_BITS) + 1;
 	if (b->len < nlen) {
-		if ((tmp = recallocarray(b->d, b->len, nlen, BITMAP_BYTES)) == NULL)
+		if ((tmp = recallocarray(b->d, b->len,
+		    nlen, BITMAP_BYTES)) == NULL)
 			return -1;
 		b->d = tmp;
-		memset(b->d + b->len, 0, (nlen - b->len) * BITMAP_BYTES);
 		b->len = nlen;
 	}
 	return 0;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.