From: Tilghman Lesher Date: Tue, 4 May 2010 23:55:50 +0000 (+0000) Subject: Merged revisions 261095 via svnmerge from X-Git-Tag: 1.6.1.20-rc1~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=861fdddf779feedd258ee6ed9f149bb4bf923cac;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@261097 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index bd157acfa5..6073bf91c7 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,