From: scudette@gmail.com Date: Fri, 2 Jan 2009 11:41:04 +0000 (+1100) Subject: Changed code to use proper talloc context instead of NULL to control memory leak. X-Git-Tag: samba-4.0.0alpha6~283^2~40^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=793f1cdbd918f2245255176572027763664d9d0b;p=thirdparty%2Fsamba.git Changed code to use proper talloc context instead of NULL to control memory leak. --- diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c index d6fb413b51e..4cbcb09a102 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 c9f1248bf8e..d997cb0fde5 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",