Hans Leidekker : dnsapi: Use default server list if passed in array is empty.

Alexandre Julliard julliard at winehq.org
Mon May 14 06:54:20 CDT 2018


Module: wine
Branch: stable
Commit: 3d5b42d7267cf3053e936e85a5d0f190a4cec827
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3d5b42d7267cf3053e936e85a5d0f190a4cec827

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Jan 22 10:19:05 2018 +0100

dnsapi: Use default server list if passed in array is empty.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit dfe48bab07aee196284b2c02641d353eb390f08d)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/dnsapi/query.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c
index a66db37..74b7096 100644
--- a/dlls/dnsapi/query.c
+++ b/dlls/dnsapi/query.c
@@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs )
 {
     int i;
 
+    if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS;
     if (addrs->AddrCount > MAXNS) 
     {
         WARN( "too many servers: %d only using the first: %d\n",
@@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser
     initialise_resolver();
     _res.options |= dns_map_options( options );
 
-    if (servers && (ret = dns_set_serverlist( servers )))
-        return ret;
+    if ((ret = dns_set_serverlist( servers ))) return ret;
 
     ret = dns_do_query( name, type, options, result );
 




More information about the wine-cvs mailing list