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

(get_mic*)_: make sure message_token is cleaned on error, found by IBM checker.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16953 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-02 02:12:52 +00:00
parent 19d2b32265
commit 08f8270867
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gssapi/get_mic.c
View File

@@ -59,6 +59,7 @@ mic_des
message_token->length = total_len; message_token->length = total_len;
message_token->value = malloc (total_len); message_token->value = malloc (total_len);
if (message_token->value == NULL) { if (message_token->value == NULL) {
message_token->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -150,6 +151,7 @@ mic_des3
message_token->length = total_len; message_token->length = total_len;
message_token->value = malloc (total_len); message_token->value = malloc (total_len);
if (message_token->value == NULL) { if (message_token->value == NULL) {
message_token->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -179,6 +181,8 @@ mic_des3
kret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto); kret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
free (tmp); free (tmp);
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
@@ -196,6 +200,8 @@ mic_des3
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
@@ -221,6 +227,8 @@ mic_des3
ETYPE_DES3_CBC_NONE, &crypto); ETYPE_DES3_CBC_NONE, &crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
@@ -238,6 +246,8 @@ mic_des3
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;

10
lib/gssapi/krb5/get_mic.c
View File

@@ -59,6 +59,7 @@ mic_des
message_token->length = total_len; message_token->length = total_len;
message_token->value = malloc (total_len); message_token->value = malloc (total_len);
if (message_token->value == NULL) { if (message_token->value == NULL) {
message_token->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -150,6 +151,7 @@ mic_des3
message_token->length = total_len; message_token->length = total_len;
message_token->value = malloc (total_len); message_token->value = malloc (total_len);
if (message_token->value == NULL) { if (message_token->value == NULL) {
message_token->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -179,6 +181,8 @@ mic_des3
kret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto); kret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
free (tmp); free (tmp);
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
@@ -196,6 +200,8 @@ mic_des3
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
@@ -221,6 +227,8 @@ mic_des3
ETYPE_DES3_CBC_NONE, &crypto); ETYPE_DES3_CBC_NONE, &crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
@@ -238,6 +246,8 @@ mic_des3
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (kret) { if (kret) {
free (message_token->value); free (message_token->value);
message_token->value = NULL;
message_token->length = 0;
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = kret; *minor_status = kret;
return GSS_S_FAILURE; return GSS_S_FAILURE;