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..1150ccb9a71107bda0859139f42eeed687c82d77 100644 |
--- a/net/base/address_tracker_linux_unittest.cc |
+++ b/net/base/address_tracker_linux_unittest.cc |
@@ -22,10 +22,12 @@ namespace { |
const int kTestInterfaceTun = 123; |
-const char* TestGetInterfaceName(int interface_index) { |
+char* TestGetInterfaceName(unsigned int interface_index, char* buf) { |
if (interface_index == kTestInterfaceTun) |
- return "tun0"; |
- return "eth0"; |
+ strncpy(buf, "tun0", IFNAMSIZ); |
pauljensen
2015/01/15 15:05:10
I think this needs curly braces, but instead of do
derekjchow1
2015/01/15 20:32:51
Done.
|
+ else |
+ strncpy(buf, "eth0", IFNAMSIZ); |
+ return buf; |
} |
} // namespace |
@@ -520,8 +522,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) { |