krb5/patches/krb5-1.8-api.patch

   1 Reference docs don't define what happens if you call krb5_realm_compare() with
   2 malformed krb5_principal structures.  Define a behavior which keeps it from
   3 crashing if applications don't check ahead of time.
   4
   5 diff -up krb5-1.8/src/lib/krb5/krb/princ_comp.c.api krb5-1.8/src/lib/krb5/krb/princ_comp.c
   6 --- krb5-1.8/src/lib/krb5/krb/princ_comp.c.api  2009-10-30 20:48:38.000000000 -0400
   7 +++ krb5-1.8/src/lib/krb5/krb/princ_comp.c      2010-03-05 11:00:55.000000000 -0500
   8 @@ -41,6 +41,12 @@ realm_compare_flags(krb5_context context
   9      const krb5_data *realm1 = krb5_princ_realm(context, princ1);
  10      const krb5_data *realm2 = krb5_princ_realm(context, princ2);
  11
  12 +    if ((princ1 == NULL) || (princ2 == NULL))
  13 +        return FALSE;
  14 +
  15 +    if ((realm1 == NULL) || (realm2 == NULL))
  16 +        return FALSE;
  17 +
  18      if (realm1->length != realm2->length)
  19          return FALSE;
  20
  21 @@ -92,6 +98,9 @@ krb5_principal_compare_flags(krb5_contex
  22      krb5_principal upn2 = NULL;
  23      krb5_boolean ret = FALSE;
  24
  25 +    if ((princ1 == NULL) || (princ2 == NULL))
  26 +        return FALSE;
  27 +
  28      if (flags & KRB5_PRINCIPAL_COMPARE_ENTERPRISE) {
  29          /* Treat UPNs as if they were real principals */
  30          if (krb5_princ_type(context, princ1) == KRB5_NT_ENTERPRISE_PRINCIPAL) {