Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Ensure that populateHostAddressees() doesn't return a list with 'null'

Browse source 
Thanks to Grigory Fedorov for reporting this.
This commit is contained in:
Florian Schmaus 2017-01-09 19:36:21 +01:00
parent 51d3c31766
commit b0fef6ffcb
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -602,7 +602,9 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
protected List<HostAddress> hostAddresses; protected List<HostAddress> hostAddresses;
/** /**
* Populates {@link #hostAddresses} with at least one host address. * Populates {@link #hostAddresses} with the resolved addresses or with the configured host address. If no host
* address was configured and all lookups failed, for example with NX_DOMAIN, then {@link #hostAddresses} will be
* populated with the empty list.
* *
* @return a list of host addresses where DNS (SRV) RR resolution failed. * @return a list of host addresses where DNS (SRV) RR resolution failed.
*/ */
@ -616,14 +618,15 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
else if (config.host != null) { else if (config.host != null) {
hostAddresses = new ArrayList<HostAddress>(1); hostAddresses = new ArrayList<HostAddress>(1);
HostAddress hostAddress = DNSUtil.getDNSResolver().lookupHostAddress(config.host, config.port, failedAddresses, config.getDnssecMode()); HostAddress hostAddress = DNSUtil.getDNSResolver().lookupHostAddress(config.host, config.port, failedAddresses, config.getDnssecMode());
hostAddresses.add(hostAddress); if (hostAddress != null) {
hostAddresses.add(hostAddress);
}
} else { } else {
// N.B.: Important to use config.serviceName and not AbstractXMPPConnection.serviceName // N.B.: Important to use config.serviceName and not AbstractXMPPConnection.serviceName
hostAddresses = DNSUtil.resolveXMPPServiceDomain(config.getXMPPServiceDomain().toString(), failedAddresses, config.getDnssecMode()); hostAddresses = DNSUtil.resolveXMPPServiceDomain(config.getXMPPServiceDomain().toString(), failedAddresses, config.getDnssecMode());
} }
// If we reach this, then hostAddresses *must not* be empty, i.e. there is at least one host added, either the // Either the populated host addresses are not empty *or* there must be at least one failed address.
// config.host one or the host representing the service name by DNSUtil assert(!hostAddresses.isEmpty() || !failedAddresses.isEmpty());
assert(!hostAddresses.isEmpty());
return failedAddresses; return failedAddresses;
} }