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

krb5: Use krb5_enomem() in KCM

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-24 22:11:49 -06:00
parent 2a7095971a
commit c44f94fa7e
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/kcm.c
View File

@@ -84,8 +84,7 @@ kcm_send_request(krb5_context context,
ret = krb5_storage_to_data(request, &request_data); ret = krb5_storage_to_data(request, &request_data);
if (ret) { if (ret) {
krb5_clear_error_message(context); return krb5_enomem(context);
return KRB5_CC_NOMEM;
} }
ret = heim_ipc_call(kcm_ipc, &request_data, response_data, NULL); ret = heim_ipc_call(kcm_ipc, &request_data, response_data, NULL);
@@ -104,10 +103,8 @@ krb5_kcm_storage_request(krb5_context context,
*storage_p = NULL; *storage_p = NULL;
sp = krb5_storage_emem(); sp = krb5_storage_emem();
if (sp == NULL) { if (sp == NULL)
krb5_set_error_message(context, KRB5_CC_NOMEM, N_("malloc: out of memory", "")); return krb5_enomem(context);
return KRB5_CC_NOMEM;
}
/* Send MAJOR | VERSION | OPCODE */ /* Send MAJOR | VERSION | OPCODE */
ret = krb5_store_int8(sp, KCM_PROTOCOL_VERSION_MAJOR); ret = krb5_store_int8(sp, KCM_PROTOCOL_VERSION_MAJOR);
@@ -697,8 +694,7 @@ kcm_get_next (krb5_context context,
c->offset++; c->offset++;
if (sret != sizeof(c->uuids[c->offset])) { if (sret != sizeof(c->uuids[c->offset])) {
krb5_storage_free(request); krb5_storage_free(request);
krb5_clear_error_message(context); return krb5_enomem(context);
return ENOMEM;
} }
ret = krb5_kcm_call(context, request, &response, &response_data); ret = krb5_kcm_call(context, request, &response, &response_data);
@@ -926,8 +922,7 @@ kcm_get_cache_next(krb5_context context, krb5_cc_cursor cursor, const krb5_cc_op
c->offset++; c->offset++;
if (sret != sizeof(c->uuids[c->offset])) { if (sret != sizeof(c->uuids[c->offset])) {
krb5_storage_free(request); krb5_storage_free(request);
krb5_clear_error_message(context); return krb5_enomem(context);
return ENOMEM;
} }
ret = krb5_kcm_call(context, request, &response, &response_data); ret = krb5_kcm_call(context, request, &response, &response_data);
@@ -1041,7 +1036,7 @@ kcm_get_default_name(krb5_context context, const krb5_cc_ops *ops,
aret = asprintf(str, "%s:%s", ops->prefix, name); aret = asprintf(str, "%s:%s", ops->prefix, name);
free(name); free(name);
if (aret == -1 || *str == NULL) if (aret == -1 || *str == NULL)
return ENOMEM; return krb5_enomem(context);
return 0; return 0;
} }