From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 16 Sep 2011 13:53:27 +0000 (+0000)
Subject: c3054, also do not memset after GNUNET_malloc, malloc already memsets to 0
X-Git-Tag: initial-import-from-subversion-38251~17082
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a01069103ba40de0386ff895199ced38b6653734;p=oweals%2Fgnunet.git

c3054, also do not memset after GNUNET_malloc, malloc already memsets to 0
---

diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c
index 3a05f2e24..abafe9ed6 100644
--- a/src/vpn/gnunet-daemon-exit.c
+++ b/src/vpn/gnunet-daemon-exit.c
@@ -644,7 +644,6 @@ read_service_conf (void *cls __attribute__ ((unused)), const char *section)
 
       struct redirect_service *serv =
           GNUNET_malloc (sizeof (struct redirect_service));
-      memset (serv, 0, sizeof (struct redirect_service));
       serv->my_port = local_port;
 
       if (0 == strcmp ("localhost4", hostname))
@@ -1034,7 +1033,6 @@ receive_tcp_service (void *cls
    */
   struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state));
 
-  memset (state, 0, sizeof (struct redirect_state));
   state->tunnel = tunnel;
   state->serv = serv;
   state->type = SERVICE;
@@ -1112,7 +1110,6 @@ receive_tcp_remote (void *cls
 
   struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state));
 
-  memset (state, 0, sizeof (struct redirect_state));
   state->tunnel = tunnel;
   state->type = REMOTE;
   state->hashmap = tcp_connections;
@@ -1194,7 +1191,6 @@ receive_udp_remote (void *cls
    */
   struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state));
 
-  memset (state, 0, sizeof (struct redirect_state));
   state->tunnel = tunnel;
   state->hashmap = udp_connections;
   state->type = REMOTE;
@@ -1297,7 +1293,6 @@ receive_udp_service (void *cls
    */
   struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state));
 
-  memset (state, 0, sizeof (struct redirect_state));
   state->tunnel = tunnel;
   state->serv = serv;
   state->type = SERVICE;
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 271c8a772..80cbbbd16 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -445,7 +445,6 @@ receive_mesh_answer (void *cls
 
   struct answer_packet_list *answer =
       GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *));
-  memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *));
 
   answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS);
   answer->pkt.hdr.size = htons (len);
@@ -457,6 +456,7 @@ receive_mesh_answer (void *cls
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Answer only contains %d answers.\n",
                 ntohs (pdns->s.ancount));
     free_parsed_dns_packet (pdns);
+    GNUNET_free (answer);
     return GNUNET_OK;
   }
 
@@ -564,7 +564,6 @@ send_rev_query (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   struct answer_packet_list *answer =
       GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *));
-  memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *));
 
   answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS);
   answer->pkt.hdr.size = htons (len);
@@ -661,7 +660,6 @@ receive_dht (void *cls, struct GNUNET_TIME_Absolute exp
 
   struct answer_packet_list *answer =
       GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *));
-  memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *));
 
   answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS);
   answer->pkt.hdr.size = htons (len);