From: Isaac Boukris <iboukris@gmail.com>
Date: Sun, 19 Sep 2021 12:04:14 +0000 (+0300)
Subject: krb5: allow NULL parameter to krb5_pac_free()
X-Git-Tag: ldb-2.5.0~407
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d09de5c41e729bccc2d7949d8a3568a95e80e76;p=thirdparty%2Fsamba.git

krb5: allow NULL parameter to krb5_pac_free()

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

[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>
---

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index 3b35b828402..d0483a3903b 100644
--- 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 eec1e84c7bd..18f385fac1f 100644
--- 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);