Changeset 4954 for pjproject

Timestamp:

Oct 24, 2014 3:28:05 AM (10 years ago)

Author:

nanang

Message:

Fix #1800: Fixed crash in SIP resolver when DNS server return a lot of addresses (> PJSIP_MAX_RESOLVED_ADDRESSES).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_resolve.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -454 +454 @@
     /* Build server addresses and call callback */
     srv.count = 0;
-    for (i=0; i<rec.addr_count; ++i) {
+    for (i = 0; i < rec.addr_count &&
+                srv.count < PJSIP_MAX_RESOLVED_ADDRESSES; ++i)
+    {
         srv.entry[srv.count].type = query->naptr[0].type;
         srv.entry[srv.count].priority = 0;
@@ -499 +501 @@
         unsigned j;
 
-        for (j=0; j<rec->entry[i].server.addr_count; ++j) {
+        for (j = 0; j < rec->entry[i].server.addr_count &&
+                    srv.count < PJSIP_MAX_RESOLVED_ADDRESSES; ++j)
+        {
             srv.entry[srv.count].type = query->naptr[0].type;
             srv.entry[srv.count].priority = rec->entry[i].priority;