mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

hostcache_fixoffset() is now corrected to work on 64bit architectures

Browse Source 
Bug report #564585.
This commit is contained in:
Daniel Stenberg 2002-06-05 13:41:33 +00:00
parent ac48b38842
commit 0db227f55e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/hostip.c
View File

@ -473,16 +473,16 @@ static char *MakeIP(unsigned long num,char *addr, int addr_len)
static void hostcache_fixoffset(struct hostent *h, int offset) static void hostcache_fixoffset(struct hostent *h, int offset)
{ {
int i=0; int i=0;
h->h_name=(char *)((int)h->h_name+offset); h->h_name=(char *)((long)h->h_name+offset);
h->h_aliases=(char **)((int)h->h_aliases+offset); h->h_aliases=(char **)((long)h->h_aliases+offset);
while(h->h_aliases[i]) { while(h->h_aliases[i]) {
h->h_aliases[i]=(char *)((int)h->h_aliases[i]+offset); h->h_aliases[i]=(char *)((long)h->h_aliases[i]+offset);
i++; i++;
} }
h->h_addr_list=(char **)((int)h->h_addr_list+offset); h->h_addr_list=(char **)((long)h->h_addr_list+offset);
i=0; i=0;
while(h->h_addr_list[i]) { while(h->h_addr_list[i]) {
h->h_addr_list[i]=(char *)((int)h->h_addr_list[i]+offset); h->h_addr_list[i]=(char *)((long)h->h_addr_list[i]+offset);
i++; i++;
} }
} }
@ -509,7 +509,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
if ( (in=inet_addr(hostname)) != INADDR_NONE ) { if ( (in=inet_addr(hostname)) != INADDR_NONE ) {
struct in_addr *addrentry; struct in_addr *addrentry;
int *buf = (int *)malloc(128); long *buf = (long *)malloc(sizeof(struct hostent)+128);
if(!buf) if(!buf)
return NULL; /* major failure */ return NULL; /* major failure */
*bufp = (char *)buf; *bufp = (char *)buf;
@ -524,7 +524,8 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
h->h_length = sizeof(*addrentry); h->h_length = sizeof(*addrentry);
h->h_name = *(h->h_addr_list) + h->h_length; h->h_name = *(h->h_addr_list) + h->h_length;
/* bad one h->h_name = (char*)(h->h_addr_list + h->h_length); */ /* bad one h->h_name = (char*)(h->h_addr_list + h->h_length); */
MakeIP(ntohl(in),h->h_name, 128 - (long)(h->h_name) + (long)buf); MakeIP(ntohl(in),h->h_name, sizeof(struct hostent)+128 -
(long)(h->h_name) + (long)buf);
} }
#if defined(HAVE_GETHOSTBYNAME_R) #if defined(HAVE_GETHOSTBYNAME_R)
else { else {
@ -566,7 +567,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
if(h) { if(h) {
int offset; int offset;
h=(struct hostent *)realloc(buf, step_size); h=(struct hostent *)realloc(buf, step_size);
offset=(int)h-(int)buf; offset=(long)h-(long)buf;
hostcache_fixoffset(h, offset); hostcache_fixoffset(h, offset);
buf=(int *)h; buf=(int *)h;
*bufp=(char *)buf; *bufp=(char *)buf;
@ -590,7 +591,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
if(!res) { if(!res) {
int offset; int offset;
h=(struct hostent *)realloc(buf, step_size); h=(struct hostent *)realloc(buf, step_size);
offset=(int)h-(int)buf; offset=(long)h-(long)buf;
hostcache_fixoffset(h, offset); hostcache_fixoffset(h, offset);
buf=(int *)h; buf=(int *)h;
*bufp=(char *)buf; *bufp=(char *)buf;