diff options
| author | Greg Hudson <ghudson@mit.edu> | 2016-07-15 18:51:31 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2016-07-19 18:05:19 -0400 |
| commit | ffd4a365e226df422c8978e819c5080c07547126 (patch) | |
| tree | 8e52d3a8021a7dbf8c0122c585db88945f9c524d | |
| parent | 30aa355a89c7681cda08b5815e5fd38082decc6b (diff) | |
| download | krb5-ffd4a365e226df422c8978e819c5080c07547126.zip krb5-ffd4a365e226df422c8978e819c5080c07547126.tar.gz krb5-ffd4a365e226df422c8978e819c5080c07547126.tar.bz2 | |
Fix error handling in k5_expand_path()
In k5_expand_path_tokens_extra(), don't throw away non-zero return
statuses in the cleanup handler. Reported by Will Fiveash.
(cherry picked from commit 55b46445980584644980cbe32f261eb5ba3d14eb)
ticket: 8455
version_fixed: 1.14.3
| -rw-r--r-- | src/lib/krb5/os/expand_path.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c index 6142b3b..a8a14f4 100644 --- a/src/lib/krb5/os/expand_path.c +++ b/src/lib/krb5/os/expand_path.c @@ -537,5 +537,5 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, cleanup: k5_buf_free(&buf); free_extra_tokens(extra_tokens); - return 0; + return ret; } |