ares_init.c: fix segfault triggered in ares_init_options() upon previous

failure of init_by_defaults() and incomplete cleanup there.
c-ares · Sep 6, 2011 · 3d84eb3 · 3d84eb3
1 parent 66e9143
commit 3d84eb3
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/ares_init.c b/ares_init.c
@@ -1249,15 +1249,22 @@ static int init_by_defaults(ares_channel channel)
 
   error:
   if(rc) {
-    if(channel->servers)
+    if(channel->servers) {
       free(channel->servers);
+      channel->servers = NULL;
+    }
 
     if(channel->domains && channel->domains[0])
       free(channel->domains[0]);
-    if(channel->domains)
+    if(channel->domains) {
       free(channel->domains);
-    if(channel->lookups)
+      channel->domains = NULL;
+    }
+
+    if(channel->lookups) {
       free(channel->lookups);
+      channel->lookups = NULL;
+    }
   }
 
   if(hostname)