From 1ba13718fc46527587e3dc87e776858c472bb2d2 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 20 Mar 2014 16:35:57 +0000 Subject: assigned-uniqueids: Miscellaneous cleanup and fixes. * Fix memory leak in ast_unreal_new_channels(). Made it generate the ;2 uniqueid on a stack variable instead of mallocing it. * Made send error response to ARI and AMI requests instead of just logging excessive uniqueid length and allowing truncation. action_originate() and ari_channels_handle_originate_with_id(). * Fixed minor truncating uniqueid hole when generating the ;2 uniqueid string length. Created public and internal lengths of uniqueid. The internal length can handle a max public uniqueid plus an appended ;2. * free() and ast_free() are NULL tolerant so they don't need a NULL test before calling. * Made use better struct initialization format instead of the position dependent initialization format. Also anything not explicitly initialized in the struct is initialized to zero by the compiler. * Made ast_channel_internal_set_fake_ids() use the safer ast_copy_string() instead of strncpy(). Review: https://reviewboard.asterisk.org/r/3371/ ........ Merged revisions 410949 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410950 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'main/manager.c') diff --git a/main/manager.c b/main/manager.c index 3c98185be..328878251 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4416,7 +4416,10 @@ static void *fast_originate(void *data) int reason = 0; struct ast_channel *chan = NULL, *chans[1]; char requested_channel[AST_CHANNEL_NAME]; - struct ast_assigned_ids assignedids = {in->channelid, in->otherchannelid}; + struct ast_assigned_ids assignedids = { + .uniqueid = in->channelid, + .uniqueid2 = in->otherchannelid + }; if (!ast_strlen_zero(in->app)) { res = ast_pbx_outgoing_app(in->tech, in->cap, in->data, @@ -4711,8 +4714,8 @@ static int action_originate(struct mansession *s, const struct message *m) const char *codecs = astman_get_header(m, "Codecs"); const char *early_media = astman_get_header(m, "Earlymedia"); struct ast_assigned_ids assignedids = { - astman_get_header(m, "ChannelId"), - astman_get_header(m, "OtherChannelId") + .uniqueid = astman_get_header(m, "ChannelId"), + .uniqueid2 = astman_get_header(m, "OtherChannelId"), }; struct ast_variable *vars = NULL; char *tech, *data; @@ -4728,17 +4731,20 @@ static int action_originate(struct mansession *s, const struct message *m) pthread_t th; int bridge_early = 0; - 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); - } - if (!cap) { astman_send_error(s, m, "Internal Error. Memory allocation failure."); return 0; } ast_format_cap_add(cap, ast_format_set(&tmp_fmt, AST_FORMAT_SLINEAR, 0)); + if ((assignedids.uniqueid && AST_MAX_PUBLIC_UNIQUEID < strlen(assignedids.uniqueid)) + || (assignedids.uniqueid2 && AST_MAX_PUBLIC_UNIQUEID < strlen(assignedids.uniqueid2))) { + astman_send_error_va(s, m, "Uniqueid length exceeds maximum of %d\n", + AST_MAX_PUBLIC_UNIQUEID); + res = 0; + goto fast_orig_cleanup; + } + if (ast_strlen_zero(name)) { astman_send_error(s, m, "Channel not specified"); res = 0; -- cgit v1.2.3