From 8cee1ab9882f05474e74cd1a811ab218a8a0442b Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 8 Feb 2010 20:55:39 +0000 Subject: [PATCH] pull up r23696 from trunk ------------------------------------------------------------------------ r23696 | tlyu | 2010-02-04 22:25:49 -0500 (Thu, 04 Feb 2010) | 7 lines ticket: 6600 tags: pullup target_version: 1.8 Apply patch from Arlene Berry to avoid segfault if a mech gss_inquire_context returns GSS_C_NO_NAME for the target name. ticket: 6600 version_fixed: 1.8 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23707 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/mechglue/g_inq_context.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c index fbb4127d8..bb6d5693f 100644 --- a/src/lib/gssapi/mechglue/g_inq_context.c +++ b/src/lib/gssapi/mechglue/g_inq_context.c @@ -141,6 +141,7 @@ gss_inquire_context( } if (targ_name) { + if (localTargName) { status = gssint_convert_name_to_union_name(minor_status, mech, localTargName, targ_name); @@ -150,6 +151,10 @@ gss_inquire_context( return (status); } + } + else { + *targ_name = GSS_C_NO_NAME; + } } /* spec says mech type must point to static storage */ -- 2.26.2