summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2010-08-20 15:41:57 -0700
committerNoriko Hosoi <nhosoi@redhat.com>2010-08-23 11:03:43 -0700
commitd56a29b5285b411fd9d6d0b51e1e874fc1eb1887 (patch)
tree31957f8c53e2c017abf01d3c2160e2875451e50f /ldap/servers/slapd
parent102b24925ad9dc820f19fa58d1c74f4672cc79d1 (diff)
downloadds-d56a29b5285b411fd9d6d0b51e1e874fc1eb1887.tar.gz
ds-d56a29b5285b411fd9d6d0b51e1e874fc1eb1887.tar.xz
ds-d56a29b5285b411fd9d6d0b51e1e874fc1eb1887.zip
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
https://bugzilla.redhat.com/show_bug.cgi?id=610119 Resolves: bug 610119 Bug description: Fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Fix description: Remove unnecessary NULL pointer checking in attrcrypt_keymgmt_store_key(). coverity ID: 12168
Diffstat (limited to 'ldap/servers/slapd')
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index 6600f008..83130207 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -230,12 +230,8 @@ attrcrypt_keymgmt_store_key(ldbm_instance *li, attrcrypt_cipher_state *acs, SECK
LDAPDebug(LDAP_DEBUG_ANY, "attrcrypt_keymgmt_store_key: failed to add config key entries to the DSE: %d: %s: %s\n", rc, ldap_err2string(rc), resulttext ? resulttext : "unknown");
ret = -1;
}
- if (entry_string) {
- slapi_ch_free((void**)&entry_string);
- }
- if (pb) {
- slapi_pblock_destroy(pb);
- }
+ slapi_ch_free((void**)&entry_string);
+ slapi_pblock_destroy(pb);
}
LDAPDebug(LDAP_DEBUG_TRACE,"<- attrcrypt_keymgmt_store_key\n", 0, 0, 0);
return ret;