@@ -604,9 +604,6 @@ int main(int argc, char **argv)

             t = realloc(lsockets, sizeof(int) * (nlsockets + 1));

             if (!(t)) {

-                if ((lsockets))

-                    free(lsockets);

-

                 ret = 1;

                 break;

             }

@@ -96,6 +96,8 @@ clamd_connect (const char *cfgfile, const char *option)

             return -11;

         }

+        return sockd;

+

     }

     else

 #endif

@@ -143,6 +145,7 @@ clamd_connect (const char *cfgfile, const char *option)

                 optfree(opts);

                 freeaddrinfo(res);

+

                 return sockd;

             }

@@ -190,8 +193,8 @@ clamd_connect (const char *cfgfile, const char *option)

             return -1;

         }

+        return sockd;

 #endif

-

     }

     else

     {

@@ -202,7 +205,7 @@ clamd_connect (const char *cfgfile, const char *option)

     }

     optfree (opts);

-    return sockd;

+    return -1;

 }

 int

@@ -229,7 +232,7 @@ notify (const char *cfgfile)

         {

             logg ("!NotifyClamd: Unknown answer from clamd: '%s'\n", buff);

             closesocket (sockd);

-            return 1;

+            return -1;

         }

     }

@@ -202,8 +202,6 @@ struct device *get_devices(void)

     }

 #endif

-    close(sock);

-    

     p = realloc(devices, sizeof(struct device) * (ndevices + 1));

     if (!(p))

         goto err;

@@ -215,9 +213,6 @@ struct device *get_devices(void)

     return devices;

 err:

-    if (addrs)

-        freeifaddrs(addrs);

-

     if (devices) {

         for (i=0; i < ndevices; i++)

             if (devices[i].name)

@@ -253,8 +248,10 @@ char *internal_get_host_id(void)

         return NULL;

     printable_md5 = calloc(1, 37);

-    if (!(printable_md5))

+    if (!(printable_md5)) {

+        free(devices);

         return NULL;

+    }

     cli_md5_init(&ctx);

     for (i=0; devices[i].name != NULL; i++)

@@ -394,6 +394,7 @@ struct cl_engine *cl_engine_new(void)

         mpool_destroy(new->mempool);

 #endif

         free(new);

+        free(intel);

         return NULL;

     }

 #endif

@@ -223,8 +223,8 @@ void clamav_stats_add_sample(const char *virname, const unsigned char *md5, size

         sample->virus_name[i] = strdup((virname != NULL) ? virname : "[unknown]");

         if (!(sample->virus_name[i])) {

-            free(sample);

             free(sample->virus_name);

+            free(sample);

             if (sample == intel->samples)

                 intel->samples = NULL;

@@ -117,7 +117,8 @@ int connect_host(const char *host, const char *port, uint32_t timeout, int useAs

     if (!(p)) {

         freeaddrinfo(servinfo);

-        close(sockfd);

+        if (sockfd >= 0)

+            close(sockfd);

         return -1;

     }

@@ -265,6 +266,8 @@ void submit_post(const char *host, const char *port, const char *method, const c

             if ((recvsz = recv(sockfd, buf, bufsz-1, 0) <= 0))

                 break;

+            buf[bufsz-1] = '\0';

+

             if (strstr(buf, "STATOK"))

                 break;

         }