[asterisk-commits] dvossel: branch 1.6.1 r250260 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Mar  2 18:21:22 2010
New Revision: 250260

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250260
Log:
Merged revisions 250246 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250246 | dvossel | 2010-03-02 18:18:28 -0600 (Tue, 02 Mar 2010) | 2 lines
  
  fixes signed to unsigned int comparision issue for FaxMaxDatagram value.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=250260&r1=250259&r2=250260
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Mar  2 18:21:22 2010
@@ -8319,7 +8319,7 @@
 		found = TRUE;
 	} else if ((sscanf(a, "T38FaxMaxDatagram:%30u", &x) == 1) || (sscanf(a, "T38MaxDatagram:%30u", &x) == 1)) {
 		/* override the supplied value if the configuration requests it */
-		if (p->t38_maxdatagram > x) {
+		if (((signed int) p->t38_maxdatagram >= 0) && ((unsigned int) p->t38_maxdatagram > x)) {
 			ast_debug(1, "Overriding T38FaxMaxDatagram '%d' with '%d'\n", x, p->t38_maxdatagram);
 			x = p->t38_maxdatagram;
 		}