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

(gss_delete_sec_context): handle a NULL output_token

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7825 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-01-26 00:45:46 +00:00
parent 3f2e348dcb
commit 82c780d64c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gssapi/delete_sec_context.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -43,8 +43,10 @@ OM_uint32 gss_delete_sec_context
{ {
gssapi_krb5_init (); gssapi_krb5_init ();
output_token->length = 0; if (output_token) {
output_token->value = NULL; output_token->length = 0;
output_token->value = NULL;
}
krb5_auth_con_free (gssapi_krb5_context, krb5_auth_con_free (gssapi_krb5_context,
(*context_handle)->auth_context); (*context_handle)->auth_context);
@@ -58,7 +60,5 @@ OM_uint32 gss_delete_sec_context
krb5_free_ticket (gssapi_krb5_context, krb5_free_ticket (gssapi_krb5_context,
(*context_handle)->ticket); (*context_handle)->ticket);
free (*context_handle); free (*context_handle);
if (output_token)
output_token->length = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -43,8 +43,10 @@ OM_uint32 gss_delete_sec_context
{ {
gssapi_krb5_init (); gssapi_krb5_init ();
output_token->length = 0; if (output_token) {
output_token->value = NULL; output_token->length = 0;
output_token->value = NULL;
}
krb5_auth_con_free (gssapi_krb5_context, krb5_auth_con_free (gssapi_krb5_context,
(*context_handle)->auth_context); (*context_handle)->auth_context);
@@ -58,7 +60,5 @@ OM_uint32 gss_delete_sec_context
krb5_free_ticket (gssapi_krb5_context, krb5_free_ticket (gssapi_krb5_context,
(*context_handle)->ticket); (*context_handle)->ticket);
free (*context_handle); free (*context_handle);
if (output_token)
output_token->length = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }