[asterisk-commits] twilson: branch twilson/sip_binarification r314361 - in /team/twilson/sip_bin...

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Apr 20 00:31:04 2011
New Revision: 314361

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314361
Log:
Merged revisions 314359 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r314359 | twilson | 2011-04-19 22:28:36 -0700 (Tue, 19 Apr 2011) | 11 lines
  
  Merged revisions 314358 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r314358 | twilson | 2011-04-19 22:25:15 -0700 (Tue, 19 Apr 2011) | 4 lines
    
    Initialize track pointer
    
    ast_reentrancy_init checks to see if it is NULL before initializing with calloc
  ........
................

Modified:
    team/twilson/sip_binarification/   (props changed)
    team/twilson/sip_binarification/main/lock.c

Propchange: team/twilson/sip_binarification/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/twilson/sip_binarification/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 20 00:31:04 2011
@@ -1,1 +1,1 @@
-/trunk:1-314350
+/trunk:1-314360

Modified: team/twilson/sip_binarification/main/lock.c
URL: http://svnview.digium.com/svn/asterisk/team/twilson/sip_binarification/main/lock.c?view=diff&rev=314361&r1=314360&r2=314361
==============================================================================
--- team/twilson/sip_binarification/main/lock.c (original)
+++ team/twilson/sip_binarification/main/lock.c Wed Apr 20 00:31:04 2011
@@ -47,6 +47,7 @@
 	int res;
 	pthread_mutexattr_t  attr;
 
+	t->track = NULL;
 #ifdef DEBUG_THREADS
 #if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
 	if ((t->mutex) != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {