Merge branch 'master' of https://github.com/xor2003/toxcore

3 files changed, 7 insertions, 0 deletions

diff --git a/toxav/msi.c b/toxav/msi.c
index 5efaf147..7f390435 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -699,6 +699,8 @@ static void timer_terminate_session(TimerHandler *handler)
     free(handler->timers);
 
     pthread_mutex_destroy( &handler->mutex );
+
+    free(handler);
 }
 
 /**
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 3c05fe8d..436b16fd 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -86,6 +86,10 @@ static void fetch_broadcast_info(uint16_t port)
             pAdapter = pAdapter->Next;
         }
     }
+
+    if (pAdapterInfo) {
+        free(pAdapterInfo);
+    }
 }
 
 #elif defined(__linux__)
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index 5dae1262..c7bccab7 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -805,6 +805,7 @@ static int handle_TCP_packet(TCP_Server *TCP_server, uint32_t con_id, const uint
                     return -1;
 
                 IP_Port source;
+                source.port = 0;  // dummy initialise
                 source.ip.family = TCP_ONION_FAMILY;
                 source.ip.ip6.uint32[0] = con_id;
                 source.ip.ip6.uint64[1] = con->identifier;