Changeset 848 for branches/ithildin-1.1

Timestamp:

04/30/10 01:57:25 (2 years ago)

Author:

wd

Message:

• Fix poor allocation of time_t array
• Fix a couple va_start/va_end pairs missed in 847

Location:

branches/ithildin-1.1/modules

Files:

• dns/dns.c (modified) (1 diff)
• ircd/send.c (modified) (6 diffs)

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

@@ -163 +163 @@
         free(dns.pending.retry_times);
     dns.pending.retry_times =
-        calloc(1, sizeof(unsigned int) * (dns.pending.retries + 1));
+        calloc(1, sizeof(time_t) * (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/ircd/send.c

@@ -734 +734 @@
         return; /* nothing to do here. */
 
-    va_start(vl, msg);
     snprintf(lmsg, 512, ":*** Notice -- %s", msg);
     /* now just walk down the list of users and send the message off. */
@@ -741 +740 @@
             continue;
 
+        va_start(vl, msg);
         sendto_common(clp->cli->conn, NULL, ircd.me, "NOTICE", clp->cli->nick,
                 lmsg, vl);
-    }
-
-    va_end(vl);
+        va_end(vl);
+    }
 }
 
@@ -757 +756 @@
         return; /* nothing to do here. */
 
-    va_start(vl, msg);
     snprintf(lmsg, 512, ":*** Notice -- %s", msg);
     /* now just walk down the list of users and send the message off. */
@@ -767 +765 @@
             continue;
 
+        va_start(vl, msg);
         sendto_common(clp->cli->conn, NULL, ircd.me, "NOTICE", clp->cli->nick,
                 lmsg, vl);
-    }
-
-    va_end(vl);
+        va_end(vl);
+    }
 }
 
@@ -787 +785 @@
         return; /* nothing to do here. */
 
-    va_start(vl, msg);
-        
     snprintf(lmsg, 512, ":*** %s -- from %s: %s", type,
             (cli != NULL ? cli->nick : srv->name), msg);
@@ -798 +794 @@
         /* note that we always send from ourselves still!  this isn't a
          * mistake. */
+        va_start(vl, msg);
         sendto_common(clp->cli->conn, NULL, ircd.me, "NOTICE", clp->cli->nick,
                 lmsg, vl);
-    }
-
-    va_end(vl);
+        va_end(vl);
+    }
 }