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

(wrap*): Reset output_buffer on error.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16951 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-02 02:10:03 +00:00
parent dd8e66433c
commit 2740149d18
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/gssapi/krb5/wrap.c
View File

@@ -174,6 +174,7 @@ wrap_des
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) { if (output_message_buffer->value == NULL) {
output_message_buffer->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -298,6 +299,7 @@ wrap_des3
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) { if (output_message_buffer->value == NULL) {
output_message_buffer->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -332,6 +334,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -347,6 +351,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -376,6 +382,8 @@ wrap_des3
&crypto); &crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -394,6 +402,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -419,6 +429,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -428,6 +440,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }

14
lib/gssapi/wrap.c
View File

@@ -174,6 +174,7 @@ wrap_des
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) { if (output_message_buffer->value == NULL) {
output_message_buffer->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -298,6 +299,7 @@ wrap_des3
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) { if (output_message_buffer->value == NULL) {
output_message_buffer->length = 0;
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -332,6 +334,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -347,6 +351,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -376,6 +382,8 @@ wrap_des3
&crypto); &crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -394,6 +402,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -419,6 +429,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
@@ -428,6 +440,8 @@ wrap_des3
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
free (output_message_buffer->value); free (output_message_buffer->value);
output_message_buffer->length = 0;
output_message_buffer->value = NULL;
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }