[29984] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.14]: Fix krb5int_open_plugin_dirs() error handling
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Jul 17 22:41:35 2017
Date: Mon, 17 Jul 2017 22:41:21 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201707180241.v6I2fLhg002945@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/5293591d56d47e4345c958acaa68f095e0919d76
commit 5293591d56d47e4345c958acaa68f095e0919d76
Author: Martin Kittel <martin.kittel@sap.com>
Date: Wed Mar 15 17:21:28 2017 +0100
Fix krb5int_open_plugin_dirs() error handling
In krb5int_open_plugin_dirs(), if constructing filepath fails,
filepath is set to null but accessed a few lines later. Add an error
check before calling krb5int_open_plugin().
(cherry picked from commit ec56309e95e37cb3c91bad2a696b9bd094620876)
ticket: 8565
version_fixed: 1.14.6
src/util/support/plugins.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
index b0bb2ad..47368be 100644
--- a/src/util/support/plugins.c
+++ b/src/util/support/plugins.c
@@ -592,9 +592,10 @@ krb5int_open_plugin_dirs (const char * const *dirnames,
}
}
- if (krb5int_open_plugin (filepath, &handle, ep) == 0) {
+ if (!err && krb5int_open_plugin(filepath, &handle, ep) == 0) {
err = krb5int_plugin_file_handle_array_add (&h, &count, handle);
- if (!err) { handle = NULL; } /* h takes ownership */
+ if (!err)
+ handle = NULL; /* h takes ownership */
}
free(filepath);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
