[svn-commits] dvossel: branch 1.6.1 r238430 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Jan  7 14:20:38 2010
New Revision: 238430

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238430
Log:
Merged revisions 238412 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238412 | dvossel | 2010-01-07 14:15:27 -0600 (Thu, 07 Jan 2010) | 16 lines
  
  Merged revisions 238411 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238411 | dvossel | 2010-01-07 14:14:25 -0600 (Thu, 07 Jan 2010) | 10 lines
    
    fixes crash in "scheduled_destroy" in chan_iax
    
    A signed short was used to represent a callnumber.  This is makes
    it possible to attempt to access the iaxs array with a negative
    index.
    
    (closes issue #16565)
    Reported by: jensvb
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

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

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=238430&r1=238429&r2=238430
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Thu Jan  7 14:20:38 2010
@@ -1561,7 +1561,7 @@
 
 static int scheduled_destroy(const void *vid)
 {
-	short callno = PTR_TO_CALLNO(vid);
+	unsigned short callno = PTR_TO_CALLNO(vid);
 	ast_mutex_lock(&iaxsl[callno]);
 	if (iaxs[callno]) {
 		if (option_debug) {