Fix nsort initialization

Author: Alexander Drachevskiy http://c-ares.haxx.se/mail/c-ares-archive-2014-07/0004.shtml http://c-ares.haxx.se/mail/c-ares-archive-2014-07/0014.shtml
9 years ago · 008e9a9ecd
parent 670a38e19d
commit 008e9a9ecd
1 changed files with 8 additions and 7 deletions
--- a/ares_init.c
+++ b/ares_init.c
@ -520,13 +520,14 @@ static int init_by_options(ares_channel channel,
    }

  /* copy sortlist */
-  if ((optmask & ARES_OPT_SORTLIST) && (channel->nsort == -1) &&
-      (options->nsort>0)) {
+  if ((optmask & ARES_OPT_SORTLIST) && (channel->nsort == -1)) {
+    if (options->nsort > 0) {
      channel->sortlist = ares_malloc(options->nsort * sizeof(struct apattern));
      if (!channel->sortlist)
        return ARES_ENOMEM;
      for (i = 0; i < options->nsort; i++)
        channel->sortlist[i] = options->sortlist[i];
+    }
    channel->nsort = options->nsort;
  }