]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 262240 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Mon, 10 May 2010 19:06:54 +0000 (19:06 +0000)
committerDavid Vossel <dvossel@digium.com>
Mon, 10 May 2010 19:06:54 +0000 (19:06 +0000)
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

apps/app_directed_pickup.c

index c409a245bf2a3dbb0dec7378515198b3ff3bd3f4..a00cd475e2f87cb31f53fd8130a84611e1b611a8 100644 (file)
@@ -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