aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/krb5/krb/ChangeLog6
-rw-r--r--src/lib/krb5/krb/preauth2.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 2241278..95578ce 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-17 Ezra Peisach <epeisach@mit.edu>
+
+ * preauth2.c (krb5_do_preauth): Upon error in decoding
+ krb5_type_info{,2}, on failure, do not call krb5_free_type_info
+ with a null pointer.
+
2005-01-15 Jeffrey Altman <jaltman@mit.edu>
* cp_key_cnt.c, copy_princ.c:
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index 6238a82..e146c3d 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -892,7 +892,8 @@ krb5_do_preauth(krb5_context context,
else ret = decode_krb5_etype_info(&scratch, &etype_info);
if (ret) {
ret = 0; /*Ignore error and etype_info element*/
- krb5_free_etype_info( context, etype_info);
+ if (etype_info)
+ krb5_free_etype_info( context, etype_info);
etype_info = NULL;
continue;
}