Commit 05b26e75 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Brad House provided a fix for ares_save_options(): Apparently I overlooked 

something with the ares_save_options() where it would try to do a malloc(0)
when no options of that type needed to be saved.  On most platforms, this was
fine because malloc(0) doesn't actually return NULL, but on AIX it does, so
ares_save_options would return ARES_ENOMEM.
parent 6c511abf

ares/CHANGES

+9 −1
Original line number Diff line number Diff line 
  Changelog for the c-ares project



* September 22 2007 (Daniel Stenberg)



- Brad House provided a fix for ares_save_options():



  Apparently I overlooked something with the ares_save_options() where it

  would try to do a malloc(0) when no options of that type needed to be saved.

  On most platforms, this was fine because malloc(0) doesn't actually return

  NULL, but on AIX it does, so ares_save_options would return ARES_ENOMEM.



* July 14 2007 (Daniel Stenberg)



- Vlad Dinulescu fixed two outstanding valgrind reports:

 

 

  1. In ares_query.c , in find_query_by_id we compare q->qid (which is a short

  int variable) with qid, which is declared as an int variable.  Moreover,

  DNS_HEADER_SET_QID is used to set the value of qid, but DNS_HEADER_SET_QID

ares/ares_init.c

+33 −24
Original line number Diff line number Diff line
@@ -244,18 +244,22 @@ int ares_save_options(ares_channel channel, struct ares_options *options, 
  options->sock_state_cb_data = channel->sock_state_cb_data;



  /* Copy servers */

  if (channel->nservers) {

    options->servers =

      malloc(channel->nservers * sizeof(struct server_state));

    if (!options->servers && channel->nservers != 0)

      return ARES_ENOMEM;

    for (i = 0; i < channel->nservers; i++)

      options->servers[i] = channel->servers[i].addr;

  }

  options->nservers = channel->nservers;



  /* copy domains */

  if (channel->ndomains) {

    options->domains = malloc(channel->ndomains * sizeof(char *));

    if (!options->domains)

      return ARES_ENOMEM;



    for (i = 0; i < channel->ndomains; i++)

    {

      options->ndomains = i;
@@ -263,14 +267,18 @@ int ares_save_options(ares_channel channel, struct ares_options *options, 
      if (!options->domains[i])

        return ARES_ENOMEM;

    }

  }

  options->ndomains = channel->ndomains;



  /* copy lookups */

  if (channel->lookups) {

    options->lookups = strdup(channel->lookups);

  if (!options->lookups)

    if (!options->lookups && channel->lookups)

      return ARES_ENOMEM;

  }



  /* copy sortlist */

  if (channel->nsort) {

    options->sortlist = malloc(channel->nsort * sizeof(struct apattern));

    if (!options->sortlist)

      return ARES_ENOMEM;
@@ -279,6 +287,7 @@ int ares_save_options(ares_channel channel, struct ares_options *options, 
      memcpy(&(options->sortlist[i]), &(channel->sortlist[i]),

             sizeof(struct apattern));

    }

  }

  options->nsort = channel->nsort;



  return ARES_SUCCESS;