From: Kevin P. Fleming Date: Thu, 10 Nov 2005 23:22:37 +0000 (+0000) Subject: issue #5707 X-Git-Tag: 1.2.0-rc2~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54dd7ac9fa8fef2699a93234e38c18a005e880a7;p=thirdparty%2Fasterisk.git issue #5707 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7053 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/ChangeLog b/ChangeLog index 27b3230f09..315883afef 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-11-10 Kevin P. Fleming + * apps/app_queue.c (rqm_exec): correct segfault problem (issue #5705) + (aqm_exec): ditto + * app.c (ast_app_parse_options): don't increment 's' until after checking for NULL (related to issue #5630) * apps/app_rpt.c: solve a memory leak (config structure was not freed) (issue #5706 diff --git a/apps/app_queue.c b/apps/app_queue.c index 5d8b4bc4f0..ef8a1b2b7d 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2720,7 +2720,7 @@ static int rqm_exec(struct ast_channel *chan, void *data) AST_STANDARD_APP_ARGS(args, parse); if (ast_strlen_zero(args.interface)) { - ast_copy_string(args.interface, chan->name, sizeof(args.interface)); + args.interface = ast_strdupa(chan->name); temppos = strrchr(args.interface, '-'); if (temppos) *temppos = '\0'; @@ -2788,7 +2788,7 @@ static int aqm_exec(struct ast_channel *chan, void *data) AST_STANDARD_APP_ARGS(args, parse); if (ast_strlen_zero(args.interface)) { - ast_copy_string(args.interface, chan->name, sizeof(args.interface)); + args.interface = ast_strdupa(chan->name); temppos = strrchr(args.interface, '-'); if (temppos) *temppos = '\0';