Merged revisions 307142 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 9 Feb 2011 05:53:29 +0000 (05:53 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 9 Feb 2011 05:53:29 +0000 (05:53 +0000)
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.)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307143 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/lock.c

index 0443808..33e3345 100644 (file)
@@ -61,7 +61,9 @@ int __ast_pthread_mutex_init(int tracking, const char *filename, int lineno, con
 
 #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);