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

diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c
index d77cce45b56d36585c97b2df269061dbdcf80765..f241c0acb24fd5fe35d41a2ef2be560c3ec59758 100644 (file)
--- 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;
     }