summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-06-25 11:19:56 -0400
committerGreg Hudson <ghudson@mit.edu>2012-06-25 11:20:25 -0400
commit036ca94bdc00cc8eb248dc5c0da85ab556d3373e (patch)
tree7dd066dd1b81f054810d38e8ae343e8fdb3363b8 /src
parentcff6ea939f061d17a5742a04b8eeb2905c1813dc (diff)
downloadkrb5-036ca94bdc00cc8eb248dc5c0da85ab556d3373e.tar.gz
krb5-036ca94bdc00cc8eb248dc5c0da85ab556d3373e.tar.xz
krb5-036ca94bdc00cc8eb248dc5c0da85ab556d3373e.zip
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. ticket: 7185 target_version: 1.10.3 tags: pullup
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/ccache/cc_dir.c4
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 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;
}