aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/pbx.c6
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;