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

lib/kadm5: use krb5_enomem() where possible

Browse Source 
Change-Id: I487fbc640a8f793f0aa02ef4c94099e09241d616
This commit is contained in:
Jeffrey Altman
2018-12-24 14:53:06 -05:00
committed by Nico Williams
parent 50ebc1491a
commit db859520b4
23 changed files with 122 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/kadm5/common_glue.c
View File

@@ -152,6 +152,7 @@ kadm5_decrypt_key(void *server_handle,
krb5_keysalt *keysalt, int *kvnop)
{
size_t i;
kadm5_server_context *context = server_handle;
if (kvno < 1 || stype != -1)
return KADM5_DECRYPT_USAGE_NOSUPP;
@@ -164,7 +165,7 @@ kadm5_decrypt_key(void *server_handle,
keyblock->keyvalue.length = entry->key_data[i].key_data_length[0];
keyblock->keyvalue.data = malloc(keyblock->keyvalue.length);
if (keyblock->keyvalue.data == NULL)
return ENOMEM;
return krb5_enomem(context->context);
memcpy(keyblock->keyvalue.data,
entry->key_data[i].key_data_contents[0],
keyblock->keyvalue.length);
@@ -260,6 +261,7 @@ kadm5_setkey_principal_3(void *server_handle,
kadm5_ret_t ret;
krb5_key_data *new_key_data = NULL;
size_t i;
kadm5_server_context *context = server_handle;
if (n_keys < 1)
return EINVAL;
@@ -286,7 +288,7 @@ kadm5_setkey_principal_3(void *server_handle,
new_key_data = calloc((n_keys + princ_ent.n_key_data),
sizeof(*new_key_data));
if (new_key_data == NULL) {
ret = ENOMEM;
ret = krb5_enomem(context->context);
goto out;
}
@@ -295,7 +297,7 @@ kadm5_setkey_principal_3(void *server_handle,
} else {
new_key_data = calloc(n_keys, sizeof(*new_key_data));
if (new_key_data == NULL) {
ret = ENOMEM;
ret = krb5_enomem(context->context);
goto out;
}
}
@@ -311,7 +313,7 @@ kadm5_setkey_principal_3(void *server_handle,
new_key_data[i].key_data_contents[0] =
malloc(keyblocks[i].keyvalue.length);
if (new_key_data[i].key_data_contents[0] == NULL) {
ret = ENOMEM;
ret = krb5_enomem(context->context);
goto out;
}
memcpy(new_key_data[i].key_data_contents[0],