Make sure patterns are always last (bug #2435)

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

1 files changed, 7 insertions, 1 deletions

diff --git a/pbx.c b/pbx.c
index dd8abbd4a..2bc05ff5d 100755
--- a/pbx.c
+++ b/pbx.c
@@ -3830,7 +3830,13 @@ int ast_add_extension2(struct ast_context *con,
 	}
 	e = con->root;
 	while(e) {
-		res= strcmp(e->exten, extension);
+		/* Make sure patterns are always last! */
+		if ((e->exten[0] != '_') && (extension[0] == '_'))
+			res = -1;
+		else if ((e->exten[0] == '_') && (extension[0] != '_'))
+			res = 1;
+		else
+			res= strcmp(e->exten, extension);
 		if (!res) {
 			if (!e->matchcid && !tmp->matchcid)
 				res = 0;