Fix a delete type mismatch (deleting a sockaddr_in6* as a sockaddr*)

webrtc/rtc_base/network_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/rtc_base/network.h"
 
+#include <stdlib.h>
+
 #include <memory>
 #include <vector>
+
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/nethelpers.h"
 #include "webrtc/rtc_base/networkmonitor.h"
 #if defined(WEBRTC_POSIX)
 #include <sys/types.h>
 #include <net/if.h>
 #include "webrtc/rtc_base/ifaddrs_converter.h"
 #endif  // defined(WEBRTC_POSIX)
 #include "webrtc/rtc_base/gunit.h"
 #if defined(WEBRTC_WIN)
@@ skipping 90 matching lines @@
                                  bool include_ignored,
                                  NetworkManager::NetworkList* networks) {
     // Use the base IfAddrsConverter for test cases.
     std::unique_ptr<IfAddrsConverter> ifaddrs_converter(new IfAddrsConverter());
     network_manager.ConvertIfAddrs(interfaces, ifaddrs_converter.get(),
                                    include_ignored, networks);
   }
 
   struct sockaddr_in6* CreateIpv6Addr(const std::string& ip_string,
                                       uint32_t scope_id) {
-    struct sockaddr_in6* ipv6_addr = new struct sockaddr_in6;
+    struct sockaddr_in6* ipv6_addr = static_cast<struct sockaddr_in6*>(
+        malloc(sizeof(struct sockaddr_in6)));

[kwiberg-webrtc, 2017/08/17 22:18:48]

Note: Unlike in C, in C++ you don't have to say "struct Foo" everywhere. Just
"Foo" will do.

[oprypin_webrtc, 2017/08/18 07:12:37]

Leaving as is because these pure C structs are referred to with `struct`
throughout the file.

     memset(ipv6_addr, 0, sizeof(struct sockaddr_in6));

[kwiberg-webrtc, 2017/08/17 22:18:48]

You could replace the malloc+memset pair with calloc if you wanted:

  auto* ipv6_addr = static_cast<sockaddr_in6*>(calloc(1, sizeof(sockaddr_in6)));

[oprypin_webrtc, 2017/08/18 07:12:37]

I did give `calloc` a fair consideration, but it's really uncommon in our
codebase, even in cases like this one. Leaving.

     ipv6_addr->sin6_family = AF_INET6;
     ipv6_addr->sin6_scope_id = scope_id;
     IPAddress ip;
     IPFromString(ip_string, &ip);
     ipv6_addr->sin6_addr = ip.ipv6_address();
     return ipv6_addr;
   }
 
   // Pointers created here need to be released via ReleaseIfAddrs.
   struct ifaddrs* AddIpv6Address(struct ifaddrs* list,
@@ skipping 24 matching lines @@
     NetworkManager::Stats stats;
     CallConvertIfAddrs(network_manager, addr_list, true, &result);
     network_manager.MergeNetworkList(result, &changed, &stats);
     return addr_list;
   }
 
   void ReleaseIfAddrs(struct ifaddrs* list) {
     struct ifaddrs* if_addr = list;
     while (if_addr != nullptr) {
       struct ifaddrs* next_addr = if_addr->ifa_next;
-      delete if_addr->ifa_addr;
-      delete if_addr->ifa_netmask;
+      free(if_addr->ifa_addr);
+      free(if_addr->ifa_netmask);
       delete if_addr;
       if_addr = next_addr;
     }
   }
 #endif  // defined(WEBRTC_POSIX)
 
  protected:
   bool callback_called_;
 };
 
@@ skipping 953 matching lines @@
   // If the set default address is in a network, GetDefaultLocalAddress will
   // return the best IP in that network.
   manager.set_default_local_addresses(GetLoopbackIP(AF_INET), ip2);
   EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
   EXPECT_EQ(static_cast<IPAddress>(ip1), ip);
 
   manager.StopUpdating();
 }
 
 }  // namespace rtc