|
 |
dc8c34 |
From 5ada65ddf3075552cb2955e7835d26b5864d63fa Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
dc8c34 |
Date: Mon, 21 Apr 2014 11:32:55 -0400
|
|
|
dc8c34 |
Subject: [PATCH 204/225] Ticket 47771 - Cherry pick issue parentsdn freed
|
|
|
dc8c34 |
twice
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Called slapi_sdn_done twice for the same local variable.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47771
|
|
|
dc8c34 |
(cherry picked from commit b5cd24778cae8c8730c432f3b2a190680100c2bc)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 3 ++-
|
|
|
dc8c34 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
index c80d75a..f6e6005 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
@@ -361,6 +361,7 @@ ldbm_back_delete( Slapi_PBlock *pb )
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
retval = -1;
|
|
|
dc8c34 |
CACHE_RETURN(&(inst->inst_cache), &parent);
|
|
|
dc8c34 |
+ slapi_sdn_done(&parentsdn);
|
|
|
dc8c34 |
goto error_return;
|
|
|
dc8c34 |
} else {
|
|
|
dc8c34 |
/* entry locked, move on */
|
|
|
dc8c34 |
@@ -397,6 +398,7 @@ ldbm_back_delete( Slapi_PBlock *pb )
|
|
|
dc8c34 |
op, &haschildren);
|
|
|
dc8c34 |
/* The modify context now contains info needed later */
|
|
|
dc8c34 |
if (0 != retval) {
|
|
|
dc8c34 |
+ slapi_sdn_done(&parentsdn);
|
|
|
dc8c34 |
ldap_result_code= LDAP_OPERATIONS_ERROR;
|
|
|
dc8c34 |
goto error_return;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
@@ -1247,7 +1249,6 @@ diskfull_return:
|
|
|
dc8c34 |
slapi_ch_free((void**)&errbuf);
|
|
|
dc8c34 |
slapi_sdn_done(&nscpEntrySDN);
|
|
|
dc8c34 |
slapi_ch_free_string(&e_uniqueid);
|
|
|
dc8c34 |
- slapi_sdn_done(&parentsdn);
|
|
|
dc8c34 |
if (pb->pb_conn)
|
|
|
dc8c34 |
{
|
|
|
dc8c34 |
slapi_log_error (SLAPI_LOG_TRACE, "ldbm_back_delete", "leave conn=%" NSPRIu64 " op=%d\n", pb->pb_conn->c_connid, operation->o_opid);
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|