Multiple memory handling fixes

Correct memory clean-ups in multiple tests and a stub.

Author: michalpasztamobica

UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp

@@ -58,6 +58,7 @@ class TestDTLSSocketWrapper : public testing::Test {
         stack.return_socketAddress = SocketAddress();
         eventFlagsStubNextRetval.clear();
         delete wrapper;
+        delete transport;
     }
 
     char *cert = "-----BEGIN CERTIFICATE-----\
@@ -103,6 +104,7 @@ TEST_F(TestDTLSSocketWrapper, constructor)
 TEST_F(TestDTLSSocketWrapper, constructor_hostname)
 {
     DTLSSocketWrapper *wrapper2 = new DTLSSocketWrapper(transport, "localhost");
+    delete wrapper2;
 }
 
 /* connect */
@@ -323,6 +325,8 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
     mbedtls_stub.counter = 0;
     mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
     EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_PARAMETER);
+    // We need to deallocate the crt pointer ourselves.
+    delete (wrapper->get_ca_chain());
 }
 
 TEST_F(TestDTLSSocketWrapper, set_client_cert_key)

UNITTESTS/features/netsocket/NetworkInterface/test_NetworkInterface.cpp

@@ -216,4 +216,6 @@ TEST_F(TestNetworkInterface, correct_event_listener_per_interface)
 
     iface->remove_event_listener(my_iface_callback);
     iface2->remove_event_listener(my_iface_callback2);
+
+    delete iface2;
 }

UNITTESTS/features/netsocket/TCPSocket/test_TCPSocket.cpp

@@ -272,8 +272,12 @@ TEST_F(TestTCPSocket, accept)
     nsapi_error_t error;
     stack.return_value = NSAPI_ERROR_OK;
     socket->open((NetworkStack *)&stack);
-    EXPECT_NE(socket->accept(&error), static_cast<TCPSocket *>(NULL));
+    TCPSocket *sock = socket->accept(&error);
+    EXPECT_NE(sock, static_cast<TCPSocket *>(NULL));
     EXPECT_EQ(error, NSAPI_ERROR_OK);
+    if (sock) {
+        sock->close();
+    }
 }
 
 TEST_F(TestTCPSocket, accept_would_block)

UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp

@@ -56,6 +56,7 @@ class TestTLSSocketWrapper : public testing::Test {
         stack.return_values.clear();
         eventFlagsStubNextRetval.clear();
         delete wrapper;
+        delete transport;
     }
 
     char *cert = "-----BEGIN CERTIFICATE-----\
@@ -101,6 +102,7 @@ TEST_F(TestTLSSocketWrapper, constructor)
 TEST_F(TestTLSSocketWrapper, constructor_hostname)
 {
     TLSSocketWrapper *wrapper2 = new TLSSocketWrapper(transport, "localhost");
+    delete wrapper2;
 }
 
 /* connect */

UNITTESTS/features/netsocket/WiFiAccessPoint/test_WiFiAccessPoint.cpp

@@ -62,5 +62,6 @@ TEST_F(TestWiFiAccessPoint, set_data)
     EXPECT_EQ(testAp.channel, ap1->get_channel());
     EXPECT_EQ(testAp.rssi, ap1->get_rssi());
     EXPECT_EQ(testAp.security, ap1->get_security());
+    delete ap1;
 }
 

UNITTESTS/stubs/NetworkStack_stub.h

@@ -27,9 +27,10 @@ class NetworkStackstub : public NetworkStack {
     nsapi_error_t return_value;
     SocketAddress return_socketAddress;
 
-    NetworkStackstub()
+    NetworkStackstub() :
+        return_value(0),
+        return_socketAddress()
     {
-        return_value = 0;
     }
 
     virtual const char *get_ip_address()
@@ -57,6 +58,8 @@ class NetworkStackstub : public NetworkStack {
         if (return_value == NSAPI_ERROR_OK && return_values.front() == NSAPI_ERROR_OK) {
             // Make sure a non-NULL value is returned if error is not expected
             *handle = reinterpret_cast<nsapi_socket_t *>(1234);
+        } else {
+            *handle = NULL;
         }
         return return_value;
     };
@@ -84,6 +87,12 @@ class NetworkStackstub : public NetworkStack {
     virtual nsapi_error_t socket_accept(nsapi_socket_t server,
                                         nsapi_socket_t *handle, SocketAddress *address = 0)
     {
+        if (return_value == NSAPI_ERROR_OK && return_values.front() == NSAPI_ERROR_OK) {
+            // Make sure a non-NULL value is returned if error is not expected
+            *handle = reinterpret_cast<nsapi_socket_t *>(1234);
+        } else {
+            *handle = NULL;
+        }
         return return_value;
     };
     virtual nsapi_size_or_error_t socket_send(nsapi_socket_t handle,