From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 21 Aug 2009 16:01:33 +0000 (+0000)
Subject: fix uninitialized and off-by-one (thanks to valgrind)
X-Git-Tag: ACLCHECK_0~251
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9f2360e2a9376c79d1da6a4ca91b7148c9cf3f81;p=openldap

fix uninitialized and off-by-one (thanks to valgrind)
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 1ed62fc14e..0b74a736e0 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -515,7 +515,7 @@ template_attrs( char *template, struct attr_set *set, AttributeName **ret,
 
 	*ret = NULL;
 
-	attrs = ch_malloc(( set->count+1 )*sizeof(AttributeName));
+	attrs = ch_calloc( set->count + 1, sizeof(AttributeName) );
 	for ( i=0; i < set->count; i++ )
 		attrs[i] = set->attrs[i];
 	attr_cnt = i;
@@ -3766,8 +3766,8 @@ pc_cf_gen( ConfigArgs *c )
 					temp->attr_set_index,
 					temp->bindttr,
 					ldap_pvt_scope2str( temp->bindscope ));
-				bv.bv_len += temp->bindbase.bv_len + temp->bindftemp.bv_len + 3;
-				bv.bv_val = ch_malloc( bv.bv_len+1 );
+				bv.bv_len += temp->bindbase.bv_len + temp->bindftemp.bv_len + 4;
+				bv.bv_val = ch_malloc( bv.bv_len + 1 );
 				ptr = bv.bv_val;
 				*ptr++ = '"';
 				ptr = lutil_strcopy( ptr, temp->bindftemp.bv_val );