Changeset 1031 for pjproject/trunk/pjlib-util/src/pjlib-util/dns.c

Timestamp:

Mar 2, 2007 2:35:57 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #156: Not enough memory to parse DNS packets in resolver (thanks Frank Wiersma)

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/dns.c (modified) (7 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/dns.c

@@ -341 +341 @@
     /* Parse some well known records */
     if (rr->type == PJ_DNS_TYPE_A) {
-        pj_in_addr ip_addr;
-
-        pj_memcpy(&ip_addr, p, 4);
-        pj_strdup2(pool, &rr->rdata.a.ip_addr, pj_inet_ntoa(ip_addr));
-
+        pj_memcpy(&rr->rdata.a.ip_addr, p, 4);
         p += 4;
 
@@ -588 +584 @@
                          pool, &dst->rdata.srv.target);
     } else if (src->type == PJ_DNS_TYPE_A) {
-        pj_strdup(pool, &dst->rdata.a.ip_addr, &src->rdata.a.ip_addr);
+        dst->rdata.a.ip_addr.s_addr =  src->rdata.a.ip_addr.s_addr;
     } else if (src->type == PJ_DNS_TYPE_CNAME) {
         pj_strdup(pool, &dst->rdata.cname.name, &src->rdata.cname.name);
@@ -603 +599 @@
 PJ_DEF(void) pj_dns_packet_dup(pj_pool_t *pool,
                                const pj_dns_parsed_packet*p,
+                               unsigned options,
                                pj_dns_parsed_packet **p_dst)
 {
@@ -631 +628 @@
 
     /* Copy query section */
-    if (p->hdr.qdcount) {
+    if (p->hdr.qdcount && (options & PJ_DNS_NO_QD)==0) {
         dst->q = pj_pool_alloc(pool, p->hdr.qdcount * 
                                      sizeof(pj_dns_parsed_query));
@@ -642 +639 @@
 
     /* Copy answer section */
-    if (p->hdr.anscount) {
+    if (p->hdr.anscount && (options & PJ_DNS_NO_ANS)==0) {
         dst->ans = pj_pool_alloc(pool, p->hdr.anscount * 
                                        sizeof(pj_dns_parsed_rr));
@@ -653 +650 @@
 
     /* Copy NS section */
-    if (p->hdr.nscount) {
+    if (p->hdr.nscount && (options & PJ_DNS_NO_NS)==0) {
         dst->ns = pj_pool_alloc(pool, p->hdr.nscount * 
                                       sizeof(pj_dns_parsed_rr));
@@ -664 +661 @@
 
     /* Copy additional info section */
-    if (p->hdr.arcount) {
+    if (p->hdr.arcount && (options & PJ_DNS_NO_AR)==0) {
         dst->arr = pj_pool_alloc(pool, p->hdr.arcount * 
                                        sizeof(pj_dns_parsed_rr));