Merge enhanced status changes, add SIP subscribe from Andre

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@759 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 7 insertions, 5 deletions

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index b957f29e4..baed0f9fe 100755
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1084,13 +1084,15 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
 		cidmatch = NULL;
 	}
 	prior       = strsep(&whole_exten,",");
-	if (!strcmp(prior, "hint")) {
-	    iprior = PRIORITY_HINT;
-	} else {
-	    iprior = atoi(prior);
+	if (prior) {
+    		if (!strcmp(prior, "hint")) {
+			iprior = PRIORITY_HINT;
+		} else {
+			iprior = atoi(prior);
+		}
 	}
 	app         = strsep(&whole_exten,",");
-	if ((start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
+	if (app && (start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
 		*start = *end = '\0';
 		app_data = start + 1;
 		for (start = app_data; *start; start++)