summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-26 23:44:24 +0100
committerVolker Lendecke <vl@samba.org>2007-12-26 23:45:10 +0100
commit07867ec373b98d6c0d3048983091ba4c49231196 (patch)
treef7fe2a950a2adb83670e88b59055ab453595b552 /source3
parente70c97ef85b309d6e005c07e16a003725d21ffc8 (diff)
downloadsamba-07867ec373b98d6c0d3048983091ba4c49231196.tar.gz
samba-07867ec373b98d6c0d3048983091ba4c49231196.tar.bz2
samba-07867ec373b98d6c0d3048983091ba4c49231196.zip
Fix some memleaks
(This used to be commit 78b0b66cbac349625257260d2e45d918e0c93617)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/debug.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 87ec9ed8f5..9ea2dc151a 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -785,13 +785,13 @@ void check_log_size( void )
(void)x_vfprintf( dbf, format_str, ap );
va_end( ap );
errno = old_errno;
- return( 0 );
+ goto done;
}
/* prevent recursion by checking if reopen_logs() has temporaily
set the debugf string to NULL */
if( debugf == NULL)
- return( 0 );
+ goto done;
#ifdef WITH_SYSLOG
if( !lp_syslog_only() )
@@ -806,7 +806,7 @@ void check_log_size( void )
x_setbuf( dbf, NULL );
} else {
errno = old_errno;
- return(0);
+ goto done;
}
}
}
@@ -855,10 +855,11 @@ void check_log_size( void )
(void)x_fflush( dbf );
}
- errno = old_errno;
-
+ done:
TALLOC_FREE(tmp_debug_ctx);
+ errno = old_errno;
+
return( 0 );
}