[svn-commits] mvanbaak: branch 1.6.1 r215646 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Wed Sep  2 15:48:00 2009
New Revision: 215646

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215646
Log:
Merged revisions 215622 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r215622 | mvanbaak | 2009-09-02 22:21:51 +0200 (Wed, 02 Sep 2009) | 4 lines
  
  - lock channel before looking for a channel variable
  - Init the parkings list member of struct parkinglot.
  Thanks Sean for the explanation why this should be here.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=215646&r1=215645&r2=215646
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Wed Sep  2 15:48:00 2009
@@ -524,7 +524,9 @@
 	/* Lock parking list */
 	AST_LIST_LOCK(&parkinglot->parkings);
 	/* Check for channel variable PARKINGEXTEN */
+	ast_channel_lock(chan);
 	parkingexten = pbx_builtin_getvar_helper(chan, "PARKINGEXTEN");
+	ast_channel_unlock(chan);
 	if (!ast_strlen_zero(parkingexten)) {
 		/*!\note The API forces us to specify a numeric parking slot, even
 		 * though the architecture would tend to support non-numeric extensions
@@ -3467,6 +3469,7 @@
 		return NULL;
 	
 	ast_copy_string(newlot->name, name, sizeof(newlot->name));
+	AST_LIST_HEAD_INIT(&newlot->parkings);
 
 	return newlot;
 }