Merged revisions 209879 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r209879 | russell | 2009-08-01 06:27:25 -0500 (Sat, 01 Aug 2009) | 5 lines

  Resolve a valgrind warning about a read from uninitialized memory.

  (issue #15396)
  Reported by: aragon
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@209887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/db1-ast/mpool/mpool.c b/main/db1-ast/mpool/mpool.c
index b5b7c86..719136d 100644 (file)
--- a/main/db1-ast/mpool/mpool.c
+++ b/main/db1-ast/mpool/mpool.c
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  */
 
+#include "asterisk.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)mpool.c    8.5 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
@@ -47,6 +49,8 @@ static char sccsid[] = "@(#)mpool.c   8.5 (Berkeley) 7/26/94";
 
 #include "../include/db.h"
 
+#include "asterisk/utils.h"
+
 #define        __MPOOLINTERFACE_PRIVATE
 #include <mpool.h>
 
@@ -380,7 +384,7 @@ mpool_bkt(mp)
                        return (bp);
                }
 
-new:   if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL)
+new:   if ((bp = (BKT *) ast_calloc(1, sizeof(BKT) + mp->pagesize)) == NULL)
                return (NULL);
 #ifdef STATISTICS
        ++mp->pagealloc;