summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2006-10-02 15:23:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:31 -0500
commit91814f4b00b7088cde5c610a7e2b60d4496662b2 (patch)
treeb81b848a89f91c9da94b7ba72d6b59fdf936ba80 /source4
parent389e6549ba37644bdbdb08de432398299d7311a6 (diff)
downloadsamba-91814f4b00b7088cde5c610a7e2b60d4496662b2.tar.gz
samba-91814f4b00b7088cde5c610a7e2b60d4496662b2.tar.bz2
samba-91814f4b00b7088cde5c610a7e2b60d4496662b2.zip
r19048: ensure our memory gets cleaned up even upon exception
(This used to be commit bcf5e98a8c83791db93a9024b3433f9d5ee3cc7e)
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/ejs/literal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
index f7168e2c4e..4eeb35c423 100644
--- a/source4/scripting/ejs/literal.c
+++ b/source4/scripting/ejs/literal.c
@@ -92,7 +92,7 @@ int literal_to_var(int eid, int argc, char **argv)
tok.source = argv[0];
tok.pos = 0;
- tok.ctx = talloc_new(NULL);
+ tok.ctx = talloc_new(mprMemCtx());
if (tok.ctx == NULL) {
mpr_Return(eid, mprCreateUndefinedVar());
return 0;