summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-10-16 01:01:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:05 -0500
commit3cabd0dcae4dfa2af58e0d763e60b2b966cd93b1 (patch)
tree8439006953f9ce9d138343aa01e51ab3cbb220ab /source4/lib/ldb
parent666a72e39a09d820284bedccc6c5fe712c2e6f08 (diff)
downloadsamba-3cabd0dcae4dfa2af58e0d763e60b2b966cd93b1.tar.gz
samba-3cabd0dcae4dfa2af58e0d763e60b2b966cd93b1.tar.bz2
samba-3cabd0dcae4dfa2af58e0d763e60b2b966cd93b1.zip
r19305: Potential memleak on the ldb_context if we don't use a temp mem context
(This used to be commit c989dfbe18a2f700e952f478e258bd626c9eb2f5)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/common/ldb_ldif.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c
index 0c31f25cc7..ed76ceec76 100644
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/source4/lib/ldb/common/ldb_ldif.c
@@ -232,6 +232,8 @@ static int fold_string(int (*fprintf_fn)(void *, const char *, ...), void *priva
return total;
}
+#undef CHECK_RET
+
/*
encode as base64 to a file
*/
@@ -264,6 +266,9 @@ static const struct {
{NULL, 0}
};
+/* this macro is used to handle the return checking on fprintf_fn() */
+#define CHECK_RET do { if (ret < 0) { talloc_free(mem_ctx); return ret; } total += ret; } while (0)
+
/*
write to ldif, using a caller supplied write method
*/
@@ -272,10 +277,13 @@ int ldb_ldif_write(struct ldb_context *ldb,
void *private_data,
const struct ldb_ldif *ldif)
{
+ TALLOC_CTX *mem_ctx;
unsigned int i, j;
int total=0, ret;
const struct ldb_message *msg;
+ mem_ctx = talloc_named_const(NULL, 0, "ldb_ldif_write");
+
msg = ldif->msg;
ret = fprintf_fn(private_data, "dn: %s\n", ldb_dn_linearize(msg->dn, msg->dn));
@@ -290,6 +298,7 @@ int ldb_ldif_write(struct ldb_context *ldb,
if (!ldb_changetypes[i].name) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Error: Invalid ldif changetype %d\n",
ldif->changetype);
+ talloc_free(mem_ctx);
return -1;
}
ret = fprintf_fn(private_data, "changetype: %s\n", ldb_changetypes[i].name);
@@ -320,7 +329,7 @@ int ldb_ldif_write(struct ldb_context *ldb,
for (j=0;j<msg->elements[i].num_values;j++) {
struct ldb_val v;
- ret = h->ldif_write_fn(ldb, ldb, &msg->elements[i].values[j], &v);
+ ret = h->ldif_write_fn(ldb, mem_ctx, &msg->elements[i].values[j], &v);
CHECK_RET;
if (ldb_should_b64_encode(&v)) {
ret = fprintf_fn(private_data, "%s:: ",