[svn-commits] tilghman: trunk r261095 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May  4 18:51:52 2010
New Revision: 261095

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261095
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=261095&r1=261094&r2=261095
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue May  4 18:51:52 2010
@@ -2630,10 +2630,15 @@
 	}
 	/* 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,