[svn-commits] tilghman: trunk r307143 - in /trunk: ./ main/lock.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Feb  8 23:53:29 2011
New Revision: 307143

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307143
Log:
Merged revisions 307142 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307142 | tilghman | 2011-02-08 23:39:39 -0600 (Tue, 08 Feb 2011) | 3 lines
  
  Initialize tracking variable in structure properly.  Fixes a memory leak.
  (Reported by The_Boy_Wonder on IRC, fixed by me.)
........

Modified:
    trunk/   (props changed)
    trunk/main/lock.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/lock.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/lock.c?view=diff&rev=307143&r1=307142&r2=307143
==============================================================================
--- trunk/main/lock.c (original)
+++ trunk/main/lock.c Tue Feb  8 23:53:29 2011
@@ -61,7 +61,9 @@
 
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
 
-	ast_reentrancy_init(&t->track);
+	if ((t->tracking = tracking)) {
+		ast_reentrancy_init(&t->track);
+	}
 #endif /* DEBUG_THREADS */
 
 	pthread_mutexattr_init(&attr);