lib/libadmsslutil/admsslutil.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit cae399a681a6808fea9853c63431cf8bfaab3cbb
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Jan 26 14:50:59 2012 -0700
Ticket #161 - Review and address latest Coverity issues
https://fedorahosted.org/389/ticket/161
Resolves: Ticket #161
Bug Description: Review and address latest Coverity issues
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description:
11120 Dereference after null check
don't access info if it is NULL
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index 7cea464..3233cf0 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -166,11 +166,13 @@ static int initNSS(const char *securitydir, AdmldapInfo info)
The pin file should contain the pin for the token
We just use adm.conf as the custom file.
*/
- custom_file_copy = admldapGetConfigFileName(info);
- PR_snprintf(custom_file, sizeof(custom_file), custom_file_copy);
- PL_strfree(custom_file_copy);
- /* set password function */
- PK11_SetPasswordFunc(getPassword_cb);
+ if (info) {
+ custom_file_copy = admldapGetConfigFileName(info);
+ PR_snprintf(custom_file, sizeof(custom_file), custom_file_copy);
+ PL_strfree(custom_file_copy);
+ /* set password function */
+ PK11_SetPasswordFunc(getPassword_cb);
+ }
/* enable all default ciphers */
if (SSL_OptionSetDefault(SSL_ENABLE_SSL2, PR_FALSE)) {