From ee7bea472202cc86e30943d0f6922c1f59e9d13c Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 30 Jun 2006 20:20:51 +0000 Subject: [PATCH] pull up r18288 from trunk r18288@cathode-dark-space: jaltman | 2006-06-30 05:22:32 -0400 ticket: new subject: corrections to gssapi mechglue g_delete_sec_context.c: use the correct type during assignment g_init_sec_context.c; prevent memory leak and make code more readable ticket: 3968 version_fixed: 1.5 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18293 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/mechglue/g_delete_sec_context.c | 2 +- src/lib/gssapi/mechglue/g_init_sec_context.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c index de70b8fb7..d5588b75b 100644 --- a/src/lib/gssapi/mechglue/g_delete_sec_context.c +++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c @@ -63,7 +63,7 @@ gss_buffer_t output_token; * call it. */ - ctx = (gss_union_ctx_id_t) *context_handle; + ctx = (gss_union_ctx_id_t *) *context_handle; mech = gssint_get_mechanism (ctx->mech_type); if (mech) { diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c index 53252f798..f5937fe8e 100644 --- a/src/lib/gssapi/mechglue/g_init_sec_context.c +++ b/src/lib/gssapi/mechglue/g_init_sec_context.c @@ -146,9 +146,6 @@ OM_uint32 * time_rec; if (union_ctx_id == NULL) goto end; - union_ctx_id->mech_type = (gss_OID) - malloc(sizeof(gss_OID_desc)); - if (generic_gss_copy_oid(&temp_minor_status, mech_type, &union_ctx_id->mech_type) != GSS_S_COMPLETE) { free(union_ctx_id); @@ -156,7 +153,7 @@ OM_uint32 * time_rec; } /* copy the supplied context handle */ - union_ctx_id->internal_ctx_id = *context_handle; + union_ctx_id->internal_ctx_id = GSS_C_NO_CONTEXT; } else union_ctx_id = *context_handle; -- 2.26.2