Branch '389-ds-base-1.2.11' - ldap/servers

[Noriko Hosoi]

ldap/servers/slapd/back-ldbm/ldbm_delete.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8e5087a39780bec2a39232160e52e5701f3882a0
Author: Noriko Hosoi 
Date:   Thu Aug 30 15:38:57 2012 -0700

Coverity defects

13089: Dereference after null check
           ldbm_back_delete (back-ldbm/ldbm_delete.c)
    	   Goto error_return if either of addr or sdnp is NULL.
    (cherry picked from commit b5422579f5e42cf04c0d4df834f5b428b16590f0)

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 14b2992..73c3658 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -125,9 +125,11 @@ ldbm_back_delete( Slapi_PBlock *pb )
    	slapi_log_error (SLAPI_LOG_TRACE, "ldbm_back_delete", "enter conn=%" NSPRIu64 " op=%d\n", pb->pb_conn->c_connid, operation->o_opid);
    }

-	if ((NULL == addr) && (NULL == sdnp))
+	if ((NULL == addr) || (NULL == sdnp))
    {
    	/* retval is -1 */
+		slapi_log_error(SLAPI_LOG_FATAL, "ldbm_back_delete",
+		            "Either of DELETE_TARGET_SDN or TARGET_ADDRESS is NULL.\n");
    	goto error_return;
    }
    dn = slapi_sdn_get_dn(sdnp);