lib/libadmsslutil/admsslutil.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2eb198fae8532bad8c5dffbbf2fbf9bae78798e7
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri Jan 27 08:17:30 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 3233cf0..ae3d1bb 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -197,7 +197,7 @@ ADMSSL_InitSimple(char* configdir, char *securitydir, int force)
admLdapInfo = admldapBuildInfo(configdir, &error);
if (!admLdapInfo && !force) return -1;
- if (force || admldapGetSecurity(admLdapInfo)) {
+ if (force || (admLdapInfo && admldapGetSecurity(admLdapInfo))) {
error = ADMSSL_Init(admLdapInfo, securitydir, force);
} else {
error = 0;
@@ -218,11 +218,11 @@ ADMSSL_Init(AdmldapInfo info, char *securitydir, int force)
if (force) {
secure = 1;
- } else {
+ } else if (info) {
secure = admldapGetSecurity(info);
}
- if (!secure) {
+ if (!secure && info) {
admldapGetLocalUserDirectory(info,
&dirURL,
&bindDN,