diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-11 19:52:14 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-11 19:52:14 +0000 |
commit | 70be34aa120cbe1e110718dbd47022549ac99035 (patch) | |
tree | b1b8ee69757df6402c7fd9358d4ae9d86fd91ff7 /main | |
parent | f3c93adf877bd6641b7c050c6ddedb63b11f2abb (diff) |
One small addition to 294384 found while very carefully merging to 1.6.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@294641 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/pbx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c index c15b598e3..ff34360e3 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4058,6 +4058,12 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, const char continue; } ao2_lock(hint); + + if (hint->exten == NULL) { + ao2_unlock(hint); + continue; + } + this->callbacks = hint->callbacks; hint->callbacks = NULL; this->laststate = hint->laststate; |