From 80740e014dbbf275486272e383bd14eda952b241 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 11 Nov 2010 19:52:14 +0000
Subject: [PATCH] One small addition to 294384 found while very carefully
 merging to 1.6.

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

diff --git a/main/pbx.c b/main/pbx.c
index c15b598e34..ff34360e31 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;