Changeset 171 for trunk/src/sh_mail.c

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

• trunk/src/sh_mail.c (modified) (14 diffs)

trunk/src/sh_mail.c

@@ -1883 +1883 @@
   } querybuf;
 
-  querybuf reply;
+  querybuf * reply;
   char expanded[1024];
   unsigned char * comp_dn, * eom;
@@ -1896 +1896 @@
     SL_RETURN (NULL, _("get_mx"));
 
+  reply = SH_ALLOC(sizeof(querybuf));
+
   errno = 0;
   length = res_query (hostname, C_IN, T_MX, 
-                      (unsigned char *) &reply, 4095);
+                      (unsigned char *) reply, 4095);
   if (length < 1)
     {
@@ -1925 +1927 @@
 #endif
         }
+      SH_FREE(reply);
       SL_RETURN (NULL, _("get_mx"));
     }
 
   ret = 0;
-  header  = (HEADER *) &reply;
+  header  = (HEADER *) reply;
 
   /* start of data section
    */
-  comp_dn = (unsigned char *) &reply + HFIXEDSZ;
+  comp_dn = (unsigned char *) reply + HFIXEDSZ;
 
   /* end-of-message
    */
-  eom     = (unsigned char *) &reply + length;
+  eom     = (unsigned char *) reply + length;
 
   /* HEADER NAME  -- must be skipped or decompressed
@@ -1958 +1961 @@
       comp_dn += ret + QFIXEDSZ;
       if (ret < 1 || comp_dn >= eom)
-        SL_RETURN (NULL, _("get_mx"));
+        {
+          SH_FREE(reply);
+          SL_RETURN (NULL, _("get_mx"));
+        }
     }
   count         = ntohs (header->ancount);
   if (count < 1)
-    SL_RETURN (NULL, _("get_mx"));
+    {
+      SH_FREE(reply);
+      SL_RETURN (NULL, _("get_mx"));
+    }
 
   retval        = SH_ALLOC (sizeof (dnsrep));
   if (!retval)
-    SL_RETURN (NULL, _("get_mx"));
+    {
+      SH_FREE(reply);
+      SL_RETURN (NULL, _("get_mx"));
+    }
+
   retval->count = count;
 
@@ -1973 +1986 @@
   if (!sl_ok_muls(count, sizeof (mx)))
     {
+      SH_FREE(reply);
       SH_FREE   (retval);
       SL_RETURN (NULL, _("get_mx"));
@@ -1981 +1995 @@
   if (!result)
     {
+      SH_FREE(reply);
       SH_FREE   (retval);
       SL_RETURN (NULL, _("get_mx"));
@@ -1995 +2010 @@
       if (ret < 1 || comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2006 +2022 @@
       if (type != T_MX || comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2017 +2034 @@
       if (comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2027 +2045 @@
       if (comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2038 +2057 @@
       if (rdlength < 1 || comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2049 +2069 @@
       if (comp_dn >= eom)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2059 +2080 @@
       if (ret < 1)
         {
+          SH_FREE(reply);
           SH_FREE (result);
           SH_FREE (retval);
@@ -2074 +2096 @@
   while (ret > 0 && comp_dn < eom && count);
 
+  SH_FREE(reply);
   SL_RETURN (retval, _("get_mx"));
 }