krb5 commit [krb5-1.14]: Fix error handling in k5_expand_path()

Tom Yu tlyu at mit.edu
Tue Jul 19 18:45:42 EDT 2016


https://github.com/krb5/krb5/commit/ffd4a365e226df422c8978e819c5080c07547126
commit ffd4a365e226df422c8978e819c5080c07547126
Author: Greg Hudson <ghudson at mit.edu>
Date:   Fri Jul 15 18:51:31 2016 -0400

    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

 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;
 }


More information about the cvs-krb5 mailing list