aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 00:19:57 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 00:19:57 +0000
commita7b00869fb569b3d5e0a9f2adfff029beba64bd1 (patch)
tree2f83c7f0ee567c2ff195bec07ffcf46a764613a6
parent8f505ee5b4472fd59c888fe6bb5285e96e99c6f7 (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.2@250253 f38db490-d61c-443f-a65b-d21fe96a405b
-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 2f916c610..6ab697768 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8937,7 +8937,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;
}