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.13.6

diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c
index 6142b3bbd5eec23d3d650e7167d3357a98e1f09c..a8a14f4bb28b7e571f1e46ba39f4dcb2daa3fe84 100644 (file)
--- 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;
 }