andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix NPE when trying to build a DnsNameResolver with a null resolvedAddressTypes (#8445)

Browse Source 
Motivation:

It should be possible to build a DnsNameResolver with a null resolvedAddressTypes, defaulting then to DEFAULT_RESOLVE_ADDRESS_TYPES (see line 309).

Sadly, `preferredAddressType` is then called on line 377 with the original parameter instead of the instance attribute, causing an NPE when it's null.

Modification:

Call preferredAddressType with instance attribuet instead of constructor parameter.

Result:

No more NPE
This commit is contained in:
Stephane Landelle 2018-10-30 13:15:16 +01:00 committed by Norman Maurer
parent 44c3b824ec
commit f4cf674f01
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
View File

@ -374,7 +374,7 @@ public class DnsNameResolver extends InetNameResolver {
default:
throw new IllegalArgumentException("Unknown ResolvedAddressTypes " + resolvedAddressTypes);
}
preferredAddressType = preferredAddressType(resolvedAddressTypes);
preferredAddressType = preferredAddressType(this.resolvedAddressTypes);
this.authoritativeDnsServerCache = checkNotNull(authoritativeDnsServerCache, "authoritativeDnsServerCache");
nameServerComparator = new NameServerComparator(preferredAddressType.addressType());

23
resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java
View File

@ -2403,4 +2403,27 @@ public class DnsNameResolverTest {
}
}
}
@Test
public void testInstanceWithNullPreferredAddressType() {
new DnsNameResolver(
group.next(), // eventLoop
new ReflectiveChannelFactory<DatagramChannel>(NioDatagramChannel.class), // channelFactory
NoopDnsCache.INSTANCE, // resolveCache
NoopAuthoritativeDnsServerCache.INSTANCE, // authoritativeDnsServerCache
NoopDnsQueryLifecycleObserverFactory.INSTANCE, // dnsQueryLifecycleObserverFactory
100, // queryTimeoutMillis
null, // resolvedAddressTypes, see https://github.com/netty/netty/pull/8445
true, // recursionDesired
1, // maxQueriesPerResolve
false, // traceEnabled
4096, // maxPayloadSize
true, // optResourceEnabled
HostsFileEntriesResolver.DEFAULT, // hostsFileEntriesResolver
DnsServerAddressStreamProviders.platformDefault(), // dnsServerAddressStreamProvider
null, // searchDomains
1, // ndots
true // decodeIdn
).close();
}
}