diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-10 16:33:10 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-10 16:33:10 +0000 |
| commit | ef69b5176daa82ba7edc09216fe0594e008098e0 (patch) | |
| tree | afe888317c7d8dc2efa81ab81a10d8566e737472 | |
| parent | c300f7e5a8634bb0f1824fc146a4c6fffae078ac (diff) | |
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.
........
Merged revisions 410368 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/manager.c | 4 | ||||
| -rw-r--r-- | res/ari/resource_channels.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c index 18755b507..fe4e7c325 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 37595006d..0f4486b52 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); } |