From: Scott Griepentrog <sgriepentrog@digium.com>
Date: Mon, 10 Mar 2014 16:32:13 +0000 (+0000)
Subject: unqiueid: correct max uniqueid length test
X-Git-Tag: 12.2.0-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972bc14e2039de08ec3e9f2ec21a13759bc37de4;p=thirdparty%2Fasterisk.git

unqiueid: correct max uniqueid length test

This patch adds null string test prior to checking for
a max uniqueid value that was added in r410157.



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

diff --git a/main/manager.c b/main/manager.c
index b64b362192..f6027abb27 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -4728,8 +4728,8 @@ static int action_originate(struct mansession *s, const struct message *m)
 	pthread_t th;
 	int bridge_early = 0;
 
-	if (strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID ||
-		strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID) {
+	if ((!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID) ||
+		(!ast_strlen_zero(assignedids.uniqueid2) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
 		ast_log(LOG_WARNING, "Uniqueid length exceeds maximum of %d\n", AST_MAX_UNIQUEID);
 	}
 
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index 37595006dd..0f4486b52b 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -779,7 +779,7 @@ static void ari_channels_handle_originate_with_id(const char *args_endpoint,
 	struct ast_assigned_ids assignedids = {args_channel_id, args_other_channel_id};
 
 	if ((!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID) || 
-		(!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
+		(!ast_strlen_zero(assignedids.uniqueid2) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
 		ast_log(LOG_WARNING, "Uniqueid length exceeds maximum of %d\n", AST_MAX_UNIQUEID);
 	}