From: Dima Tisnek <dimaqq@gmail.com>
Date: Wed, 16 Feb 2011 22:43:49 +0000 (+0100)
Subject: config_sortlist: (win32) missing else
X-Git-Tag: upstream/1.10.0~215
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e14f136aa3415e28f01f7dd1c1497ddafecd3af5;p=platform%2Fupstream%2Fc-ares.git

config_sortlist: (win32) missing else

Without an else there, contents of "pat" that could have been
successfully set just above, may be clobbered by successive unsuccessful
calls to "xxx_pton" or "ip_addr".
---

diff --git a/ares_init.c b/ares_init.c
index d2f4a72..4c54c86 100644
--- a/ares_init.c
+++ b/ares_init.c
@@ -1292,9 +1292,9 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
           if (!sortlist_alloc(sortlist, nsort, &pat))
             return ARES_ENOMEM;
         }
-      if (ipbufpfx[0] &&
-          (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addrV4,
-                                     sizeof(pat.addrV4))) > 0)
+      else if (ipbufpfx[0] &&
+               (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addrV4,
+                                          sizeof(pat.addrV4))) > 0)
         {
           pat.type = PATTERN_CIDR;
           pat.mask.bits = (unsigned short)bits;