From 03e33174394afb8e541ebc71d1c696d8e1cc3898 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 21 Jan 2009 23:28:11 +0000
Subject: [PATCH] Merged revisions 169869 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r169869 | file | 2009-01-21 19:25:27 -0400 (Wed, 21 Jan 2009) | 11 lines

  Merged revisions 169867 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r169867 | file | 2009-01-21 19:20:47 -0400 (Wed, 21 Jan 2009) | 4 lines

    Read lock the contexts to maintain the locking order when we are notified that the state of a device has changed.
    (closes issue #13839)
    Reported by: mcallist
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/pbx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/pbx.c b/main/pbx.c
index e944aa1744..a9d011e134 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3302,6 +3302,8 @@ static int handle_statechange(void *datap)
 {
 	struct ast_hint *hint;
 	struct statechange *sc = datap;
+
+	ast_rdlock_contexts();
 	AST_RWLIST_RDLOCK(&hints);
 
 	AST_RWLIST_TRAVERSE(&hints, hint, list) {
@@ -3340,6 +3342,7 @@ static int handle_statechange(void *datap)
 		hint->laststate = state;	/* record we saw the change */
 	}
 	AST_RWLIST_UNLOCK(&hints);
+	ast_unlock_contexts();
 	ast_free(sc);
 	return 0;
 }