Use calloc properly... could result in too few bytes being allocated.

calloc(1, nelem*size) -> calloc(nelem, size)

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index d89fb840351a9edc6ebb74c6f2c04d59e8eefdfd..b7b0d9507ab8b5684e577cb2e860fbf4995a504f 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -181,8 +181,7 @@ parse_acl(
                         * by clause consists of <who> and <access>
                         */
 
-                       b = (struct access *) ch_calloc( 1,
-                           sizeof(struct access) );
+                       b = (struct access *) ch_calloc( 1, sizeof(struct access) );
 
                        if ( ++i == argc ) {
                                fprintf( stderr,

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b395a72ee2af5c2316546f5ce7bfd418fd3133a4..e55eaf1d087723919d7af48f348a386b87a7f21c 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -74,7 +74,7 @@ slapd_daemon(
        }
 #endif /* !FD_SETSIZE */
 
-       c = (Connection *) ch_calloc( 1, dtblsize * sizeof(Connection) );
+       c = (Connection *) ch_calloc( (size_t) dtblsize, sizeof(Connection) );
 
        for ( i = 0; i < dtblsize; i++ ) {
                c[i].c_dn = NULL;

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index daca60d6e16372d59093e7fdc7cae59f4c278cd5..918c97a2787ab2a3b6752f1173bf3c4e7476da37 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -244,8 +244,7 @@ add_lastmods( Operation *op, LDAPModList **modlist )
        tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
        tmp->ml_type = ch_strdup( "modifiersname" );
        tmp->ml_op = LDAP_MOD_REPLACE;
-       tmp->ml_bvalues = (struct berval **) ch_calloc( 1,
-           2 * sizeof(struct berval *) );
+       tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
        tmp->ml_bvalues[0] = ber_bvdup( &bv );
        tmp->ml_next = *modlist;
        *modlist = tmp;
@@ -264,7 +263,7 @@ add_lastmods( Operation *op, LDAPModList **modlist )
        tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
        tmp->ml_type = ch_strdup( "modifytimestamp" );
        tmp->ml_op = LDAP_MOD_REPLACE;
-       tmp->ml_bvalues = (struct berval **) ch_calloc( 1, 2 * sizeof(struct berval *) );
+       tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
        tmp->ml_bvalues[0] = ber_bvdup( &bv );
        tmp->ml_next = *modlist;
        *modlist = tmp;