Fix a potential memory leak.

[oweals/tinc.git] / src / multicast_device.c

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 0b232dbb6f0238d260a8f658f6c7a69d19374b9b..ceaa3efc78d2881dc0bbd11d682571839b28fb14 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- multicast socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,6 +56,7 @@ static bool setup_device(void) {
        space = strchr(host, ' ');
        if(!space) {
                logger(LOG_ERR, "Port number required for %s", device_info);
+               free(host);
                return false;
        }
 
@@ -69,12 +70,15 @@ static bool setup_device(void) {
        }
 
        ai = str2addrinfo(host, port, SOCK_DGRAM);
-       if(!ai)
+       if(!ai) {
+               free(host);
                return false;
+       }
 
        device_fd = socket(ai->ai_family, SOCK_DGRAM, IPPROTO_UDP);
        if(device_fd < 0) {
                logger(LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
+               free(host);
                return false;
        }
 
@@ -88,6 +92,7 @@ static bool setup_device(void) {
        if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
                closesocket(device_fd);
                logger(LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
+               free(host);
                return false;
        }
 
@@ -102,6 +107,7 @@ static bool setup_device(void) {
                        if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof mreq)) {
                                logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
                                closesocket(device_fd);
+                               free(host);
                                return false;
                        }
 #ifdef IP_MULTICAST_LOOP
@@ -123,6 +129,7 @@ static bool setup_device(void) {
                        if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof mreq)) {
                                logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
                                closesocket(device_fd);
+                               free(host);
                                return false;
                        }
 #ifdef IPV6_MULTICAST_LOOP
@@ -135,11 +142,13 @@ static bool setup_device(void) {
 #endif
        
                default:
-                       logger(LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
+                       logger(LOG_ERR, "Multicast for address family %x unsupported", ai->ai_family);
                        closesocket(device_fd);
+                       free(host);
                        return false;
        }
 
+       free(host);
        logger(LOG_INFO, "%s is a %s", device, device_info);
 
        return true;
@@ -158,7 +167,7 @@ static void close_device(void) {
 static bool read_packet(vpn_packet_t *packet) {
        int lenin;
 
-       if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
+       if((lenin = recv(device_fd, (void *)packet->data, MTU, 0)) <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
@@ -184,7 +193,7 @@ static bool write_packet(vpn_packet_t *packet) {
        ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
                           packet->len, device_info);
 
-       if(sendto(device_fd, packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
+       if(sendto(device_fd, (void *)packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
                logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
                           strerror(errno));
                return false;