lock conlock before accessing the list.

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

1 files changed, 3 insertions, 4 deletions

diff --git a/pbx.c b/pbx.c
index c1254ae60..1238a7cd3 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;