]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix error handling in k5_expand_path() 484/head
authorGreg Hudson <ghudson@mit.edu>
Fri, 15 Jul 2016 22:51:31 +0000 (18:51 -0400)
committerGreg Hudson <ghudson@mit.edu>
Tue, 19 Jul 2016 15:56:38 +0000 (11:56 -0400)
In k5_expand_path_tokens_extra(), don't throw away non-zero return
statuses in the cleanup handler.  Reported by Will Fiveash.

ticket: 8455
target_version: 1.14-next
target_version: 1.13-next
tags: pullup

src/lib/krb5/os/expand_path.c

index 6142b3bbd5eec23d3d650e7167d3357a98e1f09c..a8a14f4bb28b7e571f1e46ba39f4dcb2daa3fe84 100644 (file)
@@ -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;
 }