krb5: allow NULL parameter to krb5_pac_free()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881

[jsutton@samba.org Cherry-picked from Heimdal commit
b295167208a96e68515902138f6ce93972892ec5]

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 2d09de5c41e729bccc2d7949d8a3568a95e80e76)

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index 3b35b82840223c9130c8b78bcc0504d109321aa1..d0483a3903bb6a7a120f26ea51f5342bbd9c1057 100644 (file)
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -2074,8 +2074,7 @@ out:
 
     free_EncTicketPart(&adtkt);
 
-    if (mspac)
-       krb5_pac_free(context, mspac);
+    krb5_pac_free(context, mspac);
 
     return ret;
 }

diff --git a/source4/heimdal/lib/krb5/pac.c b/source4/heimdal/lib/krb5/pac.c
index eec1e84c7bd51148678792150a30656df6f09eb4..18f385fac1f4a251fd93cf9d6fd82458f905a7f0 100644 (file)
--- a/source4/heimdal/lib/krb5/pac.c
+++ b/source4/heimdal/lib/krb5/pac.c
@@ -435,6 +435,8 @@ krb5_pac_get_types(krb5_context context,
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_pac_free(krb5_context context, krb5_pac pac)
 {
+    if (pac == NULL)
+       return;
     krb5_data_free(&pac->data);
     krb5_data_free(&pac->ticket_sign_data);
     free(pac->pac);