From 983b3e9d13e05e21dac4acdb7552e8d9079bb0d5 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Mon, 25 Jun 2012 11:19:56 -0400 Subject: [PATCH] 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 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c index d77cce45b5..f241c0acb2 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; } -- 2.47.2