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

lib/hdb: ndbm correct asprintf error handling

Browse Source 
asprintf() return code must be checked because in case of failure
the value of the output buffer variable is undefined.

Change-Id: I75e06fffe2330ec10dbe4f678479ded479ab5931
This commit is contained in:
Jeffrey Altman
2022-01-20 23:33:11 -05:00
parent 2e54dc7aae
commit 81f3a0b804
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/hdb/ndbm.c
View File

@@ -140,8 +140,7 @@ open_lock_file(krb5_context context, const char *db_name, int *fd)
int ret = 0; int ret = 0;
/* lock old and new databases */ /* lock old and new databases */
asprintf(&lock_file, "%s.lock", db_name); if (asprintf(&lock_file, "%s.lock", db_name) == -1) {
if(lock_file == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
@@ -161,7 +160,8 @@ static krb5_error_code
NDBM_rename(krb5_context context, HDB *db, const char *new_name) NDBM_rename(krb5_context context, HDB *db, const char *new_name)
{ {
int ret; int ret;
char *old_dir, *old_pag, *new_dir, *new_pag; char *old_dir = NULL, *old_pag = NULL;
char *new_dir = NULL, *new_pag = NULL;
int old_lock_fd, new_lock_fd; int old_lock_fd, new_lock_fd;
/* lock old and new databases */ /* lock old and new databases */
@@ -190,10 +190,26 @@ NDBM_rename(krb5_context context, HDB *db, const char *new_name)
return ret; return ret;
} }
asprintf(&old_dir, "%s.dir", db->hdb_name); if (asprintf(&old_dir, "%s.dir", db->hdb_name) == -1) {
asprintf(&old_pag, "%s.pag", db->hdb_name); old_dir = NULL;
asprintf(&new_dir, "%s.dir", new_name); ret = ENOMEM;
asprintf(&new_pag, "%s.pag", new_name); goto out;
}
if (asprintf(&old_pag, "%s.pag", db->hdb_name) == -1) {
old_pag = NULL;
ret = ENOMEM;
goto out;
}
if (asprintf(&new_dir, "%s.dir", new_name) == -1) {
new_dir = NULL;
ret = ENOMEM;
goto out;
}
if (asprintf(&new_pag, "%s.pag", new_name) == -1) {
new_pag = NULL;
ret = ENOMEM;
goto out;
}
ret = rename(old_dir, new_dir) || rename(old_pag, new_pag); ret = rename(old_dir, new_dir) || rename(old_pag, new_pag);
if (ret) { if (ret) {
@@ -203,6 +219,7 @@ NDBM_rename(krb5_context context, HDB *db, const char *new_name)
krb5_set_error_message(context, ret, "rename: %s", strerror(ret)); krb5_set_error_message(context, ret, "rename: %s", strerror(ret));
} }
out:
free(old_dir); free(old_dir);
free(old_pag); free(old_pag);
free(new_dir); free(new_dir);