summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscudette@gmail.com <scudette@gmail.com>2009-01-02 22:41:04 +1100
committerVolker Lendecke <vl@samba.org>2009-01-02 20:55:20 +0100
commit793f1cdbd918f2245255176572027763664d9d0b (patch)
tree3bf3a622e023fbf39fa2a576d1c8c06169ec6040
parentcc9771d3daa84994ceec427127a71a3cf0a34b9a (diff)
downloadsamba-793f1cdbd918f2245255176572027763664d9d0b.tar.gz
samba-793f1cdbd918f2245255176572027763664d9d0b.tar.bz2
samba-793f1cdbd918f2245255176572027763664d9d0b.zip
Changed code to use proper talloc context instead of NULL to control memory leak.
-rw-r--r--source4/lib/registry/regf.c2
-rw-r--r--source4/lib/registry/tools/common.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c
index d6fb413b51..4cbcb09a10 100644
--- a/source4/lib/registry/regf.c
+++ b/source4/lib/registry/regf.c
@@ -2045,7 +2045,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location,
struct tdr_pull *pull;
int i;
- regf = (struct regf_data *)talloc_zero(NULL, struct regf_data);
+ regf = (struct regf_data *)talloc_zero(parent_ctx, struct regf_data);
regf->iconv_convenience = iconv_convenience;
diff --git a/source4/lib/registry/tools/common.c b/source4/lib/registry/tools/common.c
index c9f1248bf8..d997cb0fde 100644
--- a/source4/lib/registry/tools/common.c
+++ b/source4/lib/registry/tools/common.c
@@ -51,7 +51,7 @@ struct registry_key *reg_common_open_file(const char *path,
struct registry_context *h = NULL;
WERROR error;
- error = reg_open_hive(NULL, path, NULL, creds, ev_ctx, lp_ctx, &hive_root);
+ error = reg_open_hive(ev_ctx, path, NULL, creds, ev_ctx, lp_ctx, &hive_root);
if(!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Unable to open '%s': %s \n",