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

Use krb5_enomem() more consistently in lib/krb5.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2013-02-13 16:15:00 +08:00
parent edae63418e
commit f0f07ff408
62 changed files with 393 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
lib/krb5/digest.c
View File

@@ -54,8 +54,7 @@ krb5_digest_alloc(krb5_context context, krb5_digest *digest)
d = calloc(1, sizeof(*d));
if (d == NULL) {
*digest = NULL;
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
return krb5_enomem(context);
}
*digest = d;
@@ -106,8 +105,7 @@ krb5_digest_set_server_cb(krb5_context context,
free(digest->init.channel);
digest->init.channel = NULL;
}
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
return krb5_enomem(context);
}
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
@@ -120,10 +118,8 @@ krb5_digest_set_type(krb5_context context,
return EINVAL;
}
digest->init.type = strdup(type);
if (digest->init.type == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->init.type == NULL)
return krb5_enomem(context);
return 0;
}
@@ -137,16 +133,13 @@ krb5_digest_set_hostname(krb5_context context,
return EINVAL;
}
digest->init.hostname = malloc(sizeof(*digest->init.hostname));
if (digest->init.hostname == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->init.hostname == NULL)
return krb5_enomem(context);
*digest->init.hostname = strdup(hostname);
if (*digest->init.hostname == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->init.hostname);
digest->init.hostname = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -168,10 +161,8 @@ krb5_digest_set_server_nonce(krb5_context context,
return EINVAL;
}
digest->request.serverNonce = strdup(nonce);
if (digest->request.serverNonce == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.serverNonce == NULL)
return krb5_enomem(context);
return 0;
}
@@ -192,10 +183,8 @@ krb5_digest_set_opaque(krb5_context context,
return EINVAL;
}
digest->request.opaque = strdup(opaque);
if (digest->request.opaque == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.opaque == NULL)
return krb5_enomem(context);
return 0;
}
@@ -218,16 +207,13 @@ krb5_digest_set_identifier(krb5_context context,
return EINVAL;
}
digest->request.identifier = calloc(1, sizeof(*digest->request.identifier));
if (digest->request.identifier == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.identifier == NULL)
return krb5_enomem(context);
*digest->request.identifier = strdup(id);
if (*digest->request.identifier == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.identifier);
digest->request.identifier = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -473,16 +459,13 @@ krb5_digest_set_client_nonce(krb5_context context,
}
digest->request.clientNonce =
calloc(1, sizeof(*digest->request.clientNonce));
if (digest->request.clientNonce == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.clientNonce == NULL)
return krb5_enomem(context);
*digest->request.clientNonce = strdup(nonce);
if (*digest->request.clientNonce == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.clientNonce);
digest->request.clientNonce = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -498,10 +481,8 @@ krb5_digest_set_digest(krb5_context context,
return EINVAL;
}
digest->request.digest = strdup(dgst);
if (digest->request.digest == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.digest == NULL)
return krb5_enomem(context);
return 0;
}
@@ -515,10 +496,8 @@ krb5_digest_set_username(krb5_context context,
return EINVAL;
}
digest->request.username = strdup(username);
if (digest->request.username == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.username == NULL)
return krb5_enomem(context);
return 0;
}
@@ -532,16 +511,13 @@ krb5_digest_set_authid(krb5_context context,
return EINVAL;
}
digest->request.authid = malloc(sizeof(*digest->request.authid));
if (digest->request.authid == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.authid == NULL)
return krb5_enomem(context);
*digest->request.authid = strdup(authid);
if (*digest->request.authid == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.authid);
digest->request.authid = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -576,16 +552,13 @@ krb5_digest_set_realm(krb5_context context,
return EINVAL;
}
digest->request.realm = malloc(sizeof(*digest->request.realm));
if (digest->request.realm == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.realm == NULL)
return krb5_enomem(context);
*digest->request.realm = strdup(realm);
if (*digest->request.realm == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.realm);
digest->request.realm = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -601,16 +574,13 @@ krb5_digest_set_method(krb5_context context,
return EINVAL;
}
digest->request.method = malloc(sizeof(*digest->request.method));
if (digest->request.method == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.method == NULL)
return krb5_enomem(context);
*digest->request.method = strdup(method);
if (*digest->request.method == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.method);
digest->request.method = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -625,16 +595,13 @@ krb5_digest_set_uri(krb5_context context,
return EINVAL;
}
digest->request.uri = malloc(sizeof(*digest->request.uri));
if (digest->request.uri == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.uri == NULL)
return krb5_enomem(context);
*digest->request.uri = strdup(uri);
if (*digest->request.uri == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.uri);
digest->request.uri = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -651,16 +618,13 @@ krb5_digest_set_nonceCount(krb5_context context,
}
digest->request.nonceCount =
malloc(sizeof(*digest->request.nonceCount));
if (digest->request.nonceCount == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.nonceCount == NULL)
return krb5_enomem(context);
*digest->request.nonceCount = strdup(nonce_count);
if (*digest->request.nonceCount == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.nonceCount);
digest->request.nonceCount = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -675,16 +639,13 @@ krb5_digest_set_qop(krb5_context context,
return EINVAL;
}
digest->request.qop = malloc(sizeof(*digest->request.qop));
if (digest->request.qop == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.qop == NULL)
return krb5_enomem(context);
*digest->request.qop = strdup(qop);
if (*digest->request.qop == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
free(digest->request.qop);
digest->request.qop = NULL;
return ENOMEM;
return krb5_enomem(context);
}
return 0;
}
@@ -695,10 +656,8 @@ krb5_digest_set_responseData(krb5_context context,
const char *response)
{
digest->request.responseData = strdup(response);
if (digest->request.responseData == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (digest->request.responseData == NULL)
return krb5_enomem(context);
return 0;
}
@@ -803,8 +762,7 @@ krb5_digest_get_client_binding(krb5_context context,
if (*type == NULL || *binding == NULL) {
free(*type);
free(*binding);
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
return krb5_enomem(context);
}
} else {
*type = NULL;
@@ -842,10 +800,8 @@ krb5_ntlm_alloc(krb5_context context,
krb5_ntlm *ntlm)
{
*ntlm = calloc(1, sizeof(**ntlm));
if (*ntlm == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (*ntlm == NULL)
return krb5_enomem(context);
return 0;
}
@@ -966,10 +922,8 @@ krb5_ntlm_init_get_targetname(krb5_context context,
char **name)
{
*name = strdup(ntlm->initReply.targetname);
if (*name == NULL) {
krb5_clear_error_message(context);
return ENOMEM;
}
if (*name == NULL)
return krb5_enomem(context);
return 0;
}
@@ -1060,10 +1014,8 @@ krb5_ntlm_req_set_username(krb5_context context,
const char *username)
{
ntlm->request.username = strdup(username);
if (ntlm->request.username == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.username == NULL)
return krb5_enomem(context);
return 0;
}
@@ -1073,10 +1025,8 @@ krb5_ntlm_req_set_targetname(krb5_context context,
const char *targetname)
{
ntlm->request.targetname = strdup(targetname);
if (ntlm->request.targetname == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.targetname == NULL)
return krb5_enomem(context);
return 0;
}
@@ -1086,10 +1036,8 @@ krb5_ntlm_req_set_lm(krb5_context context,
void *hash, size_t len)
{
ntlm->request.lm.data = malloc(len);
if (ntlm->request.lm.data == NULL && len != 0) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.lm.data == NULL && len != 0)
return krb5_enomem(context);
ntlm->request.lm.length = len;
memcpy(ntlm->request.lm.data, hash, len);
return 0;
@@ -1101,10 +1049,8 @@ krb5_ntlm_req_set_ntlm(krb5_context context,
void *hash, size_t len)
{
ntlm->request.ntlm.data = malloc(len);
if (ntlm->request.ntlm.data == NULL && len != 0) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.ntlm.data == NULL && len != 0)
return krb5_enomem(context);
ntlm->request.ntlm.length = len;
memcpy(ntlm->request.ntlm.data, hash, len);
return 0;
@@ -1116,10 +1062,8 @@ krb5_ntlm_req_set_opaque(krb5_context context,
krb5_data *opaque)
{
ntlm->request.opaque.data = malloc(opaque->length);
if (ntlm->request.opaque.data == NULL && opaque->length != 0) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.opaque.data == NULL && opaque->length != 0)
return krb5_enomem(context);
ntlm->request.opaque.length = opaque->length;
memcpy(ntlm->request.opaque.data, opaque->data, opaque->length);
return 0;
@@ -1131,15 +1075,11 @@ krb5_ntlm_req_set_session(krb5_context context,
void *sessionkey, size_t length)
{
ntlm->request.sessionkey = calloc(1, sizeof(*ntlm->request.sessionkey));
if (ntlm->request.sessionkey == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.sessionkey == NULL)
return krb5_enomem(context);
ntlm->request.sessionkey->data = malloc(length);
if (ntlm->request.sessionkey->data == NULL && length != 0) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if (ntlm->request.sessionkey->data == NULL && length != 0)
return krb5_enomem(context);
memcpy(ntlm->request.sessionkey->data, sessionkey, length);
ntlm->request.sessionkey->length = length;
return 0;