Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: net/base/address_tracker_linux_unittest.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/address_tracker_linux.cc ('k') | net/base/dir_header.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/address_tracker_linux_unittest.cc
diff --git a/net/base/address_tracker_linux_unittest.cc b/net/base/address_tracker_linux_unittest.cc
index 641220731b71bbbe43b54f4e8b564921494f5b64..1eba58fbe6af35aa9319129bfba5ac214be92baa 100644
--- a/net/base/address_tracker_linux_unittest.cc
+++ b/net/base/address_tracker_linux_unittest.cc
@@ -22,10 +22,10 @@ namespace {
const int kTestInterfaceTun = 123;
-const char* TestGetInterfaceName(int interface_index) {
+char* TestGetInterfaceName(int interface_index, char* buf) {
if (interface_index == kTestInterfaceTun)
- return "tun0";
- return "eth0";
+ return strncpy(buf, "tun0", IFNAMSIZ);
+ return strncpy(buf, "eth0", IFNAMSIZ);
}
} // namespace
@@ -520,8 +520,10 @@ TEST_F(AddressTrackerLinuxTest, TunnelInterface) {
TEST_F(AddressTrackerLinuxTest, GetInterfaceName) {
InitializeAddressTracker(true);
- for (int i = 0; i < 10; i++)
- EXPECT_NE((const char*)NULL, original_get_interface_name_(i));
+ for (int i = 0; i < 10; i++) {
+ char buf[IFNAMSIZ] = {0};
+ EXPECT_NE((const char*)NULL, original_get_interface_name_(i, buf));
+ }
}
TEST_F(AddressTrackerLinuxTest, NonTrackingMode) {
« no previous file with comments | « net/base/address_tracker_linux.cc ('k') | net/base/dir_header.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698