|
 |
94d3c59 |
Reference docs don't define what happens if you call krb5_realm_compare() with
|
|
|
94d3c59 |
malformed krb5_principal structures. Define a behavior which keeps it from
|
|
|
94d3c59 |
crashing if applications don't check ahead of time.
|
|
|
94d3c59 |
|
|
|
75b0804 |
diff -up krb5-1.8/src/lib/krb5/krb/princ_comp.c.api krb5-1.8/src/lib/krb5/krb/princ_comp.c
|
|
|
75b0804 |
--- krb5-1.8/src/lib/krb5/krb/princ_comp.c.api 2009-10-30 20:48:38.000000000 -0400
|
|
|
75b0804 |
+++ krb5-1.8/src/lib/krb5/krb/princ_comp.c 2010-03-05 11:00:55.000000000 -0500
|
|
|
75b0804 |
@@ -41,6 +41,12 @@ realm_compare_flags(krb5_context context
|
|
|
94d3c59 |
const krb5_data *realm1 = krb5_princ_realm(context, princ1);
|
|
|
94d3c59 |
const krb5_data *realm2 = krb5_princ_realm(context, princ2);
|
|
|
94d3c59 |
|
|
|
94d3c59 |
+ if ((princ1 == NULL) || (princ2 == NULL))
|
|
|
75b0804 |
+ return FALSE;
|
|
|
94d3c59 |
+
|
|
|
94d3c59 |
+ if ((realm1 == NULL) || (realm2 == NULL))
|
|
|
75b0804 |
+ return FALSE;
|
|
|
94d3c59 |
+
|
|
|
94d3c59 |
if (realm1->length != realm2->length)
|
|
|
75b0804 |
return FALSE;
|
|
|
94d3c59 |
|
|
|
75b0804 |
@@ -92,6 +98,9 @@ krb5_principal_compare_flags(krb5_contex
|
|
|
94d3c59 |
krb5_principal upn2 = NULL;
|
|
|
94d3c59 |
krb5_boolean ret = FALSE;
|
|
|
94d3c59 |
|
|
|
94d3c59 |
+ if ((princ1 == NULL) || (princ2 == NULL))
|
|
|
75b0804 |
+ return FALSE;
|
|
|
94d3c59 |
+
|
|
|
94d3c59 |
if (flags & KRB5_PRINCIPAL_COMPARE_ENTERPRISE) {
|
|
|
75b0804 |
/* Treat UPNs as if they were real principals */
|
|
|
75b0804 |
if (krb5_princ_type(context, princ1) == KRB5_NT_ENTERPRISE_PRINCIPAL) {
|