diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-28 15:49:13 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-03-28 16:34:51 +0100 |
| commit | 9644b6cb50ec01c04a0d6ab17a8e39054fd8b0f8 (patch) | |
| tree | d000e447b508b5a8c282957f5b7921e768da0884 /source3/lib/time.c | |
| parent | cc2f5fd1b5aa7e7a7277557edfd4b94b0d10661d (diff) | |
| download | samba-9644b6cb50ec01c04a0d6ab17a8e39054fd8b0f8.tar.gz samba-9644b6cb50ec01c04a0d6ab17a8e39054fd8b0f8.tar.bz2 samba-9644b6cb50ec01c04a0d6ab17a8e39054fd8b0f8.zip | |
Add a talloc context parameter to current_timestring() to fix memleaks.
current_timestring used to return a string talloced to talloc_tos().
When called by DEBUG from a TALLOC_FREE, this produced messages
"no talloc stackframe around, leaking memory". For example when
used from net conf.
This also adds a temporary talloc context to alloc_sub_basic().
For this purpose, the exit strategy is slightly altered: a common
exit point is used for success and failure.
Michael
(This used to be commit 16b5800d4e3a8b88bac67b2550d14e0aaaa302a9)
Diffstat (limited to 'source3/lib/time.c')
| -rw-r--r-- | source3/lib/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c index f98e03197f..e5fd929d0f 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -687,7 +687,7 @@ int set_server_zone_offset(time_t t) Return the date and time as a string ****************************************************************************/ -char *current_timestring(bool hires) +char *current_timestring(TALLOC_CTX *ctx, bool hires) { fstring TimeBuf; struct timeval tp; @@ -739,7 +739,7 @@ char *current_timestring(bool hires) } #endif } - return talloc_strdup(talloc_tos(), TimeBuf); + return talloc_strdup(ctx, TimeBuf); } |