From 76ecf81428c161a98a5621b55a64cb8515f80585 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 10 Jul 2005 01:10:09 +0000 Subject: r8273: fixed some memory leaks in smbscript. This required converting file_load() to use talloc, which impacted quite a few bits of code, including our smb.conf processing. took the opportunity to remove the gloabls in params.c while doing this (This used to be commit b220756cb4f1d201ba3e771ca67e4bfae5eae748) --- source4/scripting/ejs/smbscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/scripting/ejs/smbscript.c') diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c index 244ae0b42a..f7556b5384 100644 --- a/source4/scripting/ejs/smbscript.c +++ b/source4/scripting/ejs/smbscript.c @@ -94,12 +94,13 @@ void ejs_exception(const char *reason) for (i=1;argv[i];i++) { argv_list = str_list_add(argv_list, argv[i]); } + talloc_steal(mem_ctx, argv_list); v = mprList("ARGV", argv_list); mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1)); mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v); /* load the script and advance past interpreter line*/ - script = file_load(fname, &script_size); + script = file_load(fname, &script_size, mem_ctx); if ((script_size > 2) && script[0] == '#' && script[1] == '!') { script += 2; -- cgit