Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 6453 - Fix memory leaks in entryrdn #6455

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue 6453 - Fix memory leaks in entryrdn #6455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
dbi_entryrdn_records_t rec = {0};
int rc = 0;
int dbop = 0;
void *prev_elem_data = NULL;

if (NULL == ctx || NULL == key || NULL == data || NULL == elem ||
NULL == comp_key) {
Expand All @@ -1548,7 +1549,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
slapi_log_err(ENTRYRDN_LOGLEVEL(rc), "_entryrdn_get_elem",
"Backend %s suffix %s is too long.\n",
ctx->be->be_name, (char*)(key->data));
rc = DBI_RC_OTHER;;
rc = DBI_RC_OTHER;
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
}
Expand All @@ -1561,8 +1562,14 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
/* Position cursor at the matching key */
*elem = NULL;
dbop = DBI_OP_MOVE_NEAR_DATA;

retry_get:
if (*elem) {
/* This is a retry, so free the previous elem's data */
slapi_ch_free((void**)&prev_elem_data);
}
rc = dblayer_cursor_op(&ctx->cursor, dbop, key, data);
prev_elem_data = data->data; /* save pointer to data so we can free it on a retry */
*elem = (rdn_elem *)data->data;
dblayer_value_init(ctx->be, data);

Expand Down Expand Up @@ -1591,6 +1598,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
}
if (*elem && RDN_IS_REDIRECT(*elem)) {
rc = _entryrdn_resolve_redirect(ctx, elem, 1);
prev_elem_data = *elem;
if (rc) {
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
Expand All @@ -1607,7 +1615,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
}
if (*elem && 0 != strcmp(comp_key, (char *)(*elem)->rdn_elem_nrdn_rdn)) {
/* the exact element was not found */
if (rc ==0 && rec.redirect) {
if (rc == 0 && rec.redirect) {
/* If the data is redirected, it is not in entryrdn db
* so DBI_OP_MOVE_NEAR_DATA selected a wrong record
* lets try the other records with the same key
Expand All @@ -1619,13 +1627,21 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
}

bail:
if (rec.redirect) {
dblayer_value_free(ctx->be, &rec.redirect_data);
dblayer_value_free(ctx->be, &rec.redirect_key);
}
if (*elem) {
slapi_log_err(SLAPI_LOG_TRACE, "_entryrdn_get_elem", "<-- _entryrdn_get_elem (*elem rdn=%s) rc=%d\n",
RDN_ADDR(*elem), rc);
} else {
slapi_log_err(SLAPI_LOG_TRACE, "_entryrdn_get_elem", "<-- _entryrdn_get_elem (*elem NULL) rc=%d\n", rc);
}
if (rc) {
slapi_ch_free((void**)elem);
}
return rc;
}

Expand Down Expand Up @@ -1749,6 +1765,9 @@ _entryrdn_get_tombstone_elem(entryrdn_db_ctx_t *ctx,
} while (0 == rc);

bail:
if (RDN_IS_REDIRECT(childelem)) {
slapi_ch_free((void **)&childelem);
}
slapi_log_err(SLAPI_LOG_TRACE, "_entryrdn_get_tombstone_elem",
"<-- _entryrdn_get_tombstone_elem\n");
return rc;
Expand Down Expand Up @@ -3118,7 +3137,7 @@ _entryrdn_index_read(entryrdn_db_ctx_t *ctx,
if (childelems) {
break; /* get the child elems */
} else {
/* We got the targetelem.
/* We got the targetelem.
* And we don't have to gather childelems, so we can return. */
#ifdef LDAP_DEBUG_ENTRYRDN
char *dn = NULL;
Expand Down
Loading