diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-03 00:21:22 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-03 00:21:22 +0000 |
| commit | c807b5963a8a328abb96d05d0161f82f01a709fd (patch) | |
| tree | 0d4dee1f8b938a21d2386d81e7dd5ff895e6a498 | |
| parent | 66e19b891cf33f45684023b53f3e4b011f9ad1a9 (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.1@250260 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b06871c07..0d24aa8c2 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8319,7 +8319,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; } |