From: David Vossel Date: Mon, 10 May 2010 19:06:54 +0000 (+0000) Subject: Merged revisions 262240 via svnmerge from X-Git-Tag: 1.6.2.9-rc1~2^2~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f84978a40a40dc360da5a8747219980564c7dd;p=thirdparty%2Fasterisk.git Merged revisions 262240 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r262240 | dvossel | 2010-05-10 14:06:08 -0500 (Mon, 10 May 2010) | 9 lines fixes PickupChan application (closes issue #16863) Reported by: schern Patches: app_directed_pickup.c.patch uploaded by schern (license 995) for_trunk.diff uploaded by cjacobsen (license 1029) Tested by: Graber, cjacobsen, lathama, rickead2000, dvossel ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262241 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index c409a245bf..a00cd475e2 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -129,9 +129,9 @@ static struct ast_channel *my_ast_get_channel_by_name_locked(const char *channam size_t channame_len, chkchan_len; channame_len = strlen(channame); - chkchan_len = channame_len + 2; + chkchan_len = channame_len + 1; - chkchan = alloca(chkchan_len); + chkchan = alloca(chkchan_len + 1); /* need to append a '-' for the comparison so we check full channel name, * i.e SIP/hgc- , use a temporary variable so original stays the same for