oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Round #1 of scan-build warnings cleanup

Browse Source
This commit is contained in:
Nicolas Williams
2016-11-15 19:38:04 -06:00
parent 274021f7db
commit 953dc07391
13 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hdb/db3.c
View File

@@ -454,7 +454,7 @@ hdb_db3_create(krb5_context context, HDB **db,
const char *filename)
{
DB3_HDB **db3 = (DB3_HDB **)db;
*db = calloc(1, sizeof(**db3)); /* Allocate space for the larger db3 */
*db3 = calloc(1, sizeof(**db3)); /* Allocate space for the larger db3 */
if (*db == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;

5
lib/hdb/hdb-ldap.c
View File

@@ -1114,7 +1114,8 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
goto out;
}
ent->entry.etypes->len = ldap_count_values_len(vals);
ent->entry.etypes->val = calloc(ent->entry.etypes->len, sizeof(int));
ent->entry.etypes->val = calloc(ent->entry.etypes->len,
sizeof(ent->entry.etypes->val[0]));
if (ent->entry.etypes->val == NULL) {
ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory");
@@ -1573,7 +1574,7 @@ LDAP_firstkey(krb5_context context, HDB *db, unsigned flags,
"(|(objectClass=krb5Principal)(objectClass=sambaSamAccount))",
krb5kdcentry_attrs, 0,
NULL, NULL, NULL, 0, &msgid);
if (msgid < 0)
if (ret != LDAP_SUCCESS || msgid < 0)
return HDB_ERR_NOENTRY;
HDBSETMSGID(db, msgid);

14
lib/hdb/hdb-mdb.c
View File

@@ -282,14 +282,11 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
if((flags & O_ACCMODE) == O_RDONLY)
myflags |= MDB_RDONLY;
if (asprintf(&fn, "%s.mdb", db->hdb_name) == -1) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
}
if (asprintf(&fn, "%s.mdb", db->hdb_name) == -1)
return krb5_enomem(context);
if (mdb_env_create(&mi->e)) {
free(fn);
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
return krb5_enomem(context);
}
tmp = krb5_config_get_int_default(context, NULL, 0, "kdc",
@@ -297,6 +294,7 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
if (tmp) {
ret = mdb_env_set_maxreaders(mi->e, tmp);
if (ret) {
free(fn);
krb5_set_error_message(context, ret, "setting maxreaders on %s: %s",
db->hdb_name, mdb_strerror(ret));
return ret;
@@ -310,6 +308,7 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
maps *= KILO;
ret = mdb_env_set_mapsize(mi->e, maps);
if (ret) {
free(fn);
krb5_set_error_message(context, ret, "setting mapsize on %s: %s",
db->hdb_name, mdb_strerror(ret));
return ret;
@@ -317,16 +316,15 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
}
ret = mdb_env_open(mi->e, fn, myflags, mode);
free(fn);
if (ret) {
fail:
mdb_env_close(mi->e);
mi->e = 0;
free(fn);
krb5_set_error_message(context, ret, "opening %s: %s",
db->hdb_name, mdb_strerror(ret));
return ret;
}
free(fn);
ret = mdb_txn_begin(mi->e, NULL, MDB_RDONLY, &txn);
if (ret)