Commit 9263652c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Fixes bug report #556930 - we need to make sure that the data is all right 

after we've realloc() the packed hostent struct.
parent bc743755

lib/hostip.c

+16 −3
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data, 
#else /* following code is IPv4-only */



#ifndef HAVE_GETHOSTBYNAME_R

static void hostcache_fixoffset(struct hostent *h, int offset);

/**

 * Performs a "deep" copy of a hostent into a buffer (returns a pointer to the

 * copy). Make absolutely sure the destination buffer is big enough!
@@ -363,6 +364,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data, 
static struct hostent* pack_hostent(char** buf, struct hostent* orig)

{

  char *bufptr;

  char *newbuf;

  struct hostent* copy;



  int i;
@@ -427,7 +429,18 @@ static struct hostent* pack_hostent(char** buf, struct hostent* orig) 
  }

  copy->h_addr_list[i] = NULL;



  *buf=(char *)realloc(*buf, (int)bufptr-(int)(*buf));

  /* now, shrink the allocated buffer to the size we actually need, which

     most often is only a fraction of the original alloc */

  newbuf=(char *)realloc(*buf, (int)bufptr-(int)(*buf));



  /* if the alloc moved, we need to adjust things again */

  if(newbuf != *buf)

    hostcache_fixoffset((struct hostent*)newbuf, (int)newbuf-(int)*buf);



  /* setup the return */

  *buf = newbuf;

  copy = (struct hostent*)newbuf;



  return copy;

}

#endif