s4:heimdal: import lorikeet-heimdal-200908050050 (commit 8714779fa7376fd9f7761587639e...

[samba.git] / source4 / heimdal / lib / gssapi / mech / gss_release_name.c

diff --git a/source4/heimdal/lib/gssapi/mech/gss_release_name.c b/source4/heimdal/lib/gssapi/mech/gss_release_name.c
index ad07c60bda5bad1d1cde59b9741ac0f396d49554..c5e348d5c0efd8693b03c6f5957078e4571bc854 100644 (file)
--- a/source4/heimdal/lib/gssapi/mech/gss_release_name.c
+++ b/source4/heimdal/lib/gssapi/mech/gss_release_name.c
@@ -33,23 +33,28 @@ OM_uint32 GSSAPI_LIB_FUNCTION
 gss_release_name(OM_uint32 *minor_status,
     gss_name_t *input_name)
 {
-       struct _gss_name *name = (struct _gss_name *) *input_name;
+       struct _gss_name *name;
 
        *minor_status = 0;
-       if (name) {
-               if (name->gn_type.elements)
-                       free(name->gn_type.elements);
-               while (SLIST_FIRST(&name->gn_mn)) {
-                       struct _gss_mechanism_name *mn;
-                       mn = SLIST_FIRST(&name->gn_mn);
-                       SLIST_REMOVE_HEAD(&name->gn_mn, gmn_link);
-                       mn->gmn_mech->gm_release_name(minor_status,
-                           &mn->gmn_name);
-                       free(mn);
-               }
-               gss_release_buffer(minor_status, &name->gn_value);
-               free(name);
-               *input_name = GSS_C_NO_NAME;
+
+       if (input_name == NULL || *input_name == NULL)
+           return GSS_S_COMPLETE;
+
+       name = (struct _gss_name *) *input_name;
+
+       if (name->gn_type.elements)
+               free(name->gn_type.elements);
+       while (SLIST_FIRST(&name->gn_mn)) {
+               struct _gss_mechanism_name *mn;
+               mn = SLIST_FIRST(&name->gn_mn);
+               SLIST_REMOVE_HEAD(&name->gn_mn, gmn_link);
+               mn->gmn_mech->gm_release_name(minor_status,
+                                             &mn->gmn_name);
+               free(mn);
        }
+       gss_release_buffer(minor_status, &name->gn_value);
+       free(name);
+       *input_name = GSS_C_NO_NAME;
+
        return (GSS_S_COMPLETE);
 }