aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 00:22:22 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 00:22:22 +0000
commit5e9eaf97a239da0d14fea81f243c57cdf595348f (patch)
treea8feeafb11f9445f4c55550c0e47974026741a92 /channels
parent61259e9a8fb377446ffff9d00cf8844355168df1 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@250265 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a00929901..9e797e7d6 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;
}