diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-04 23:55:50 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-04 23:55:50 +0000 |
| commit | eb93b32966c7ecb4837b95d28efa15d461d8500c (patch) | |
| tree | 3d71ee9e2fcbbcade0be59906db50bc5414f2937 | |
| parent | 2745908f096e997e5f8572174e2e6c32c6fbd099 (diff) | |
Merged revisions 261095 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@261097 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index bd157acfa..6073bf91c 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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, |