Import crash fixes for ITS#3638, 3647 from HEAD

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 8f90b8ad6873bf7113e6464d9a2fff0c02c540d1..2a84f24f4f6de58d4ece7bc5960cf770b95da5fd 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -452,6 +452,7 @@ bdb_dn2idl(
        ((char *)key.data)[0] = prefix;
        AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
 
+       BDB_IDL_ZERO( ids );
        rc = bdb_idl_fetch_key( op->o_bd, db, NULL, &key, ids );
 
        if( rc != 0 ) {
@@ -905,7 +906,7 @@ struct dn2id_cookie {
        ID dbuf;
        ID *ids;
        void *ptr;
-       ID tmp[BDB_IDL_DB_SIZE];
+       ID tmp[BDB_IDL_UM_SIZE];
        ID *buf;
        DBT key;
        DBT data;