kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 261095 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r261095 | tilghman | 2010-05-04 18:51:52 -0500 (Tue, 04 May 2010) | 18 lines
  
  Merged revisions 261093-261094 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r261093 | tilghman | 2010-05-04 18:36:53 -0500 (Tue, 04 May 2010) | 7 lines
    
    Protect against overflow, when calculating how long to wait for a frame.
    
    (closes issue #17128)
     Reported by: under
     Patches: 
           d.diff uploaded by under (license 914)
  ........
    r261094 | tilghman | 2010-05-04 18:47:08 -0500 (Tue, 04 May 2010) | 2 lines
    
    Add a tiny corner case to the previous commit
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@261097 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-05-04 23:55:50 +00:00
parent 50c7e8bb73
commit 861fdddf77
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/channel.c
View File

@@ -2068,10 +2068,15 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
}
/* Wait full interval */
rms = *ms;
if (!ast_tvzero(whentohangup)) {
/* INT_MAX, not LONG_MAX, because it matters on 64-bit */
if (!ast_tvzero(whentohangup) && whentohangup.tv_sec < INT_MAX / 1000) {
rms = whentohangup.tv_sec * 1000 + whentohangup.tv_usec / 1000; /* timeout in milliseconds */
if (*ms >= 0 && *ms < rms) /* original *ms still smaller */
if (*ms >= 0 && *ms < rms) { /* original *ms still smaller */
rms = *ms;
}
} else if (!ast_tvzero(whentohangup) && rms < 0) {
/* Tiny corner case... call would need to last >24 days */
rms = INT_MAX;
}
/*
* Build the pollfd array, putting the channels' fds first,