- 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.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@215622 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 0 deletions

diff --git a/main/features.c b/main/features.c
index 2e8bb175d..0a4336f3b 100644
--- a/main/features.c
+++ b/main/features.c
@@ -649,7 +649,9 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
 	/* 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
@@ -3729,6 +3731,7 @@ static struct ast_parkinglot *create_parkinglot(char *name)
 		return NULL;
 	
 	ast_copy_string(newlot->name, name, sizeof(newlot->name));
+	AST_LIST_HEAD_INIT(&newlot->parkings);
 
 	return newlot;
 }