Commit 015fc6aa authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

wrong, revert the previous "fix" and instead check that the fd_set pointer 

is non-NULL before we FD_CLR
parent a739b9bc

ares/ares_process.c

+25 −22
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void write_tcp_data(ares_channel channel, 
  ssize_t wcount;

  size_t n;



  if(!write_fds || (write_fd == ARES_SOCKET_BAD))

  if(!write_fds && (write_fd == ARES_SOCKET_BAD))

    /* no possible action */

    return;
@@ -167,6 +167,7 @@ static void write_tcp_data(ares_channel channel, 
          continue;

      }



      if(write_fds)

        /* If there's an error and we close this socket, then open

         * another with the same fd to talk to another server, then we

         * don't want to think that it was the new socket that was
@@ -267,7 +268,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, 
  int i;

  ssize_t count;



  if(!read_fds || (read_fd == ARES_SOCKET_BAD))

  if(!read_fds && (read_fd == ARES_SOCKET_BAD))

    /* no possible action */

    return;
@@ -287,6 +288,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, 
          continue;

      }



      if(read_fds)

        /* If there's an error and we close this socket, then open

         * another with the same fd to talk to another server, then we

         * don't want to think that it was the new socket that was
@@ -363,7 +365,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, 
  ssize_t count;

  unsigned char buf[PACKETSZ + 1];



  if(!read_fds || (read_fd == ARES_SOCKET_BAD))

  if(!read_fds && (read_fd == ARES_SOCKET_BAD))

    /* no possible action */

    return;
@@ -384,6 +386,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, 
          continue;

      }



      if(read_fds)

        /* If there's an error and we close this socket, then open

         * another with the same fd to talk to another server, then we

         * don't want to think that it was the new socket that was