Merged revisions 261093-261094 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 4 May 2010 23:51:52 +0000 (23:51 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 4 May 2010 23:51:52 +0000 (23:51 +0000)
commit6a0ea1d79eaab5ad74bea55ace9e6ff9405a7afa
tree5f7ca7e27cab0cb761b00a35ca06b91063aa50eb
parentfc652b869af90329d6c1441c4fdf9f9584d3fc7e
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/trunk@261095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c