From: David Vossel <dvossel@digium.com>
Date: Wed, 3 Mar 2010 00:22:22 +0000 (+0000)
Subject: Merged revisions 250246 via svnmerge from
X-Git-Tag: 1.6.0.26-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4244f296064bfe41dd4ed5a53d078573d2468aa;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@250265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a009299019..9e797e7d6f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7912,7 +7912,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
 		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;
 		}