diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2009-04-22 14:07:14 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2009-04-22 14:07:14 +0000 |
| commit | 57895cdc764809ad29336431ee6b43c68fe15f15 (patch) | |
| tree | ee06066b1e128e876793d149c7f3c844851f69a8 /lib/libc/db/hash/hash_buf.c | |
| parent | cff0c03ef7b93d6ab09a8ce2ab009348e5c7aecd (diff) | |
Notes
Diffstat (limited to 'lib/libc/db/hash/hash_buf.c')
| -rw-r--r-- | lib/libc/db/hash/hash_buf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c index db8ad1a3db24..0882eb315a49 100644 --- a/lib/libc/db/hash/hash_buf.c +++ b/lib/libc/db/hash/hash_buf.c @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <stddef.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef DEBUG #include <assert.h> @@ -174,12 +175,12 @@ newbuf(hashp, addr, prev_bp) */ if (hashp->nbufs || (bp->flags & BUF_PIN)) { /* Allocate a new one */ - if ((bp = (BUFHEAD *)malloc(sizeof(BUFHEAD))) == NULL) + if ((bp = (BUFHEAD *)calloc(1, sizeof(BUFHEAD))) == NULL) return (NULL); #ifdef PURIFY memset(bp, 0xff, sizeof(BUFHEAD)); #endif - if ((bp->page = (char *)malloc(hashp->BSIZE)) == NULL) { + if ((bp->page = (char *)calloc(1, hashp->BSIZE)) == NULL) { free(bp); return (NULL); } @@ -328,8 +329,10 @@ __buf_free(hashp, do_free, to_disk) } /* Check if we are freeing stuff */ if (do_free) { - if (bp->page) + if (bp->page) { + (void)memset(bp->page, 0, hashp->BSIZE); free(bp->page); + } BUF_REMOVE(bp); free(bp); bp = LRU; |