From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 10 May 2006 20:44:28 +0000 (+0000)
Subject: lock conlock before accessing the list.
X-Git-Tag: 1.4.0-beta1~1426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=466407e81490881566ca92a31d64dbe4b922396a;p=thirdparty%2Fasterisk.git

lock conlock before accessing the list.



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

diff --git a/pbx.c b/pbx.c
index c1254ae602..1238a7cd37 100644
--- a/pbx.c
+++ b/pbx.c
@@ -3422,12 +3422,11 @@ int ast_unregister_application(const char *app)
 struct ast_context *ast_context_create(struct ast_context **extcontexts, const char *name, const char *registrar)
 {
 	struct ast_context *tmp, **local_contexts;
-	int length;
-	length = sizeof(struct ast_context);
-	length += strlen(name) + 1;
+	int length = sizeof(struct ast_context) + strlen(name) + 1;
+
 	if (!extcontexts) {
-		local_contexts = &contexts;
 		ast_mutex_lock(&conlock);
+		local_contexts = &contexts;
 	} else
 		local_contexts = extcontexts;