Changeset 822

Timestamp:

11/07/08 03:28:26 (3 years ago)

Author:

wd

Message:

Fix various dumbnesses in the DNS code and the way the ircd module uses it.

Location:

branches/ithildin-1.1/modules

Files:

• dns/dns.c (modified) (1 diff)
• dns/packet.c (modified) (2 diffs)
• ircd/client.c (modified) (1 diff)
• ircd/connection.c (modified) (1 diff)

branches/ithildin-1.1/modules/dns/dns.c

@@ -163 +163 @@
         free(dns.pending.retry_times);
     dns.pending.retry_times =
-        malloc(sizeof(unsigned int) * (dns.pending.retries + 1));
+        calloc(1, sizeof(unsigned int) * (dns.pending.retries + 1));
     dns.pending.retry_times[dns.pending.retries] = dns.pending.timeout;
     for (i = dns.pending.retries - 1;i >= 0;i--)

branches/ithildin-1.1/modules/dns/packet.c

@@ -295 +295 @@
     last_rr = NULL;
     while (count) {
-        drp = malloc(sizeof(struct dns_rr));
+        drp = calloc(1, sizeof(struct dns_rr));
 
         if ((rc = dn_expand(pkt, pkt + plen, pkt + pidx, drp->name,
@@ -323 +323 @@
             /* Fill in the data.  We do a copy over first, and if we need to
              * realloc and make changes below we do that too */
-            drp->rdata.txt = malloc(drp->rdlen);
+            drp->rdata.txt = calloc(1, drp->rdlen);
             memcpy(drp->rdata.txt, rdata, drp->rdlen);
             switch (drp->type) {

branches/ithildin-1.1/modules/ircd/client.c

@@ -266 +266 @@
 
     first[0] = *nick;
-    if (!istr_okay(ircd.maps.nick_first, first) ||
-            !istr_okay(ircd.maps.nick, nick))
+    if (*nick == '\0' || !istr_okay(ircd.maps.nick_first, first) ||
+        !istr_okay(ircd.maps.nick, nick))
         return 0;
     return 1;

branches/ithildin-1.1/modules/ircd/connection.c

@@ -274 +274 @@
             while (drp != NULL) {
                 /* Check each answer.. */
-                if (drp->type == atype &&
-                        !strcasecmp(drp->rdata.txt, ip))
+                if (drp->type == atype && 
+                    drp->rdlen > 0 && drp->rdata.txt != NULL &&
+                    !strcasecmp(drp->rdata.txt, ip))
                     break;
                 drp = LIST_NEXT(drp, lp);