From e7599a6199064b7ddde8e7f1132bf86a3a573f98 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 13 May 2016 13:20:32 -0700 Subject: [PATCH] Ticket #48378 - slapi_sdn_dup should check if sdn is NULL --- ldap/servers/slapd/dn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c index 5f795cc..ce95b0b 100644 --- a/ldap/servers/slapd/dn.c +++ b/ldap/servers/slapd/dn.c @@ -2459,9 +2459,11 @@ slapi_sdn_get_rdn_ext(const Slapi_DN *sdn, Slapi_RDN *rdn, int is_tombstone) Slapi_DN * slapi_sdn_dup(const Slapi_DN *sdn) { - Slapi_DN *tmp; + Slapi_DN *tmp = NULL; SDN_DUMP( sdn, "slapi_sdn_dup"); - tmp = slapi_sdn_new_normdn_byval(slapi_sdn_get_dn(sdn)); + if (sdn) { + tmp = slapi_sdn_new_normdn_byval(slapi_sdn_get_dn(sdn)); + } return tmp; } @@ -2730,7 +2732,7 @@ slapi_moddn_get_newdn(Slapi_DN *dn_olddn, const char *newrdn, const char *newsup static void sdn_dump( const Slapi_DN *sdn, const char *text) { - LDAPDebug( LDAP_DEBUG_ANY, "SDN %s ptr=%lx dn=%s\n", text, sdn, (sdn->dn==NULL?"NULL":sdn->dn)); + LDAPDebug(LDAP_DEBUG_ANY, "SDN %s ptr=%lx dn=%s\n", text, sdn, sdn?(sdn->dn==NULL?"NULL dn":sdn->dn):"NULL sdn"); } #endif -- 2.4.11