Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

Commit e6f0644

Browse files
authored
Fix bug in localIP and revert change in TR1 tuple definition (#31)
Signed-off-by: Isaac Hier <[email protected]>
1 parent 874aaca commit e6f0644

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ if(BUILD_TESTING)
308308
src/jaegertracing/utils/UDPClientTest.cpp)
309309
add_executable(UnitTest ${TEST_SRC})
310310
target_compile_definitions(UnitTest PUBLIC
311-
GTEST_HAS_TR1_TUPLE=1
311+
GTEST_HAS_TR1_TUPLE=0
312312
GTEST_USE_OWN_TR1_TUPLE=0)
313313
target_link_libraries(
314314
UnitTest testutils GTest::main jaegertracing-static ${LIBS})

src/jaegertracing/net/IPAddress.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ struct IfAddrDeleter : public std::function<void(ifaddrs*)> {
3737
IPAddress IPAddress::localIP(int family)
3838
{
3939
return localIP([family](const ifaddrs* ifAddr) {
40-
return ifAddr->ifa_addr->sa_family == family;
40+
return ifAddr->ifa_addr != nullptr &&
41+
ifAddr->ifa_addr->sa_family == family;
4142
});
4243
}
4344

0 commit comments

Comments
 (0)