[svn-commits] dvossel: branch 1.6.2 r262241 - in /branches/1.6.2: ./ apps/

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon May 10 14:06:54 2010
New Revision: 262241

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262241
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_directed_pickup.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_directed_pickup.c?view=diff&rev=262241&r1=262240&r2=262241
==============================================================================
--- branches/1.6.2/apps/app_directed_pickup.c (original)
+++ branches/1.6.2/apps/app_directed_pickup.c Mon May 10 14:06:54 2010
@@ -129,9 +129,9 @@
 	size_t channame_len, chkchan_len;
 
 	channame_len = strlen(channame);
-	chkchan_len = channame_len + 2;
-
- 	chkchan = alloca(chkchan_len);
+	chkchan_len = channame_len + 1;
+
+ 	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