[26650] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.10]: Fix crash on invalid DIR ccache primary file
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jun 25 15:53:23 2012
Date: Mon, 25 Jun 2012 15:53:19 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201206251953.q5PJrJPn013351@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/983b3e9d13e05e21dac4acdb7552e8d9079bb0d5
commit 983b3e9d13e05e21dac4acdb7552e8d9079bb0d5
Author: Greg Hudson <ghudson@mit.edu>
Date: Mon Jun 25 11:19:56 2012 -0400
Fix crash on invalid DIR ccache primary file
If read_primary_file() fails with an error other than ENOENT, abort
cache resolution rather than dereferencing a null pointer. Reported
by Oliver Loch.
(cherry picked from commit 036ca94bdc00cc8eb248dc5c0da85ab556d3373e)
ticket: 7185
version_fixed: 1.10.3
status: resolved
src/lib/krb5/ccache/cc_dir.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c
index d77cce4..f241c0a 100644
--- a/src/lib/krb5/ccache/cc_dir.c
+++ b/src/lib/krb5/ccache/cc_dir.c
@@ -343,9 +343,9 @@ dcc_resolve(krb5_context context, krb5_ccache *cache_out, const char *residual)
if (ret)
goto cleanup;
ret = subsidiary_residual(residual, "tkt", &sresidual);
- if (ret)
- goto cleanup;
}
+ if (ret)
+ goto cleanup;
residual = sresidual;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
