moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

Revered Ashish Sharma's multiple entries patch, as it caused memory madness

Browse Source
This commit is contained in:
Daniel Stenberg 2007-06-04 21:33:02 +00:00
parent 30808dca40
commit 90d40aff72
1 changed files with 20 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
ares/ares_gethostbyname.c
View File

@ -116,7 +116,7 @@ static void next_lookup(struct host_query *hquery)
{ {
int status; int status;
const char *p; const char *p;
struct hostent *host = NULL; struct hostent *host;
for (p = hquery->remaining_lookups; *p; p++) for (p = hquery->remaining_lookups; *p; p++)
{ {
@ -151,7 +151,7 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
{ {
struct host_query *hquery = (struct host_query *) arg; struct host_query *hquery = (struct host_query *) arg;
ares_channel channel = hquery->channel; ares_channel channel = hquery->channel;
struct hostent *host = NULL; struct hostent *host;
if (status == ARES_SUCCESS) if (status == ARES_SUCCESS)
{ {
@ -242,86 +242,12 @@ static int fake_hostent(const char *name, int family, ares_host_callback callbac
return 1; return 1;
} }
static int add_host(struct hostent *hostent, struct hostent **host)
{
char **p;
char **h_addr_list = NULL;
struct hostent *hostptr = *host;
int count = 0;
int index = 0;
if (hostptr == NULL)
{
*host = hostent;
return 0;
}
for (p = hostptr->h_addr_list; *p; p++)
{
count++;
}
for (p = hostent->h_addr_list; *p; p++)
{
count++;
}
h_addr_list = malloc((count+1) * sizeof(char *));
if (!h_addr_list)
{
*host = NULL;
return -1;
}
for (p = hostptr->h_addr_list; *p; p++)
{
h_addr_list[index] = malloc(sizeof(struct in_addr));
if (h_addr_list[index])
{
memcpy(h_addr_list[index], *p, sizeof(struct in_addr));
}
else
{
free(h_addr_list);
return -1;
}
index++;
}
for(p = hostent->h_addr_list; *p; p++)
{
h_addr_list[index] = malloc(sizeof(struct in_addr));
if (h_addr_list[index])
{
memcpy(h_addr_list[index], *p, sizeof(struct in_addr));
}
else
{
free(h_addr_list);
return -1;
}
index++;
}
h_addr_list[index] = NULL;
for (p = hostptr->h_addr_list; *p; p++)
{
free(*p);
}
free(hostptr->h_addr_list);
hostptr->h_addr_list = h_addr_list;
return 0;
}
static int file_lookup(const char *name, int family, struct hostent **host) static int file_lookup(const char *name, int family, struct hostent **host)
{ {
FILE *fp; FILE *fp;
char **alias; char **alias;
int status; int status;
int error; int error;
int match;
struct hostent *hostent = NULL;
#ifdef WIN32 #ifdef WIN32
char PATH_HOSTS[MAX_PATH]; char PATH_HOSTS[MAX_PATH];
@ -357,60 +283,35 @@ static int file_lookup(const char *name, int family, struct hostent **host)
{ {
error = ERRNO; error = ERRNO;
switch(error) switch(error)
{ {
case ENOENT: case ENOENT:
case ESRCH: case ESRCH:
return ARES_ENOTFOUND; return ARES_ENOTFOUND;
default: default:
DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n", DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
error, strerror(error))); error, strerror(error)));
DEBUGF(fprintf(stderr, "Error opening file: %s\n", DEBUGF(fprintf(stderr, "Error opening file: %s\n",
PATH_HOSTS)); PATH_HOSTS));
*host = NULL; *host = NULL;
return ARES_EFILE; return ARES_EFILE;
} }
} }
while ((status = ares__get_hostent(fp, family, host)) == ARES_SUCCESS) while ((status = ares__get_hostent(fp, family, host)) == ARES_SUCCESS)
{ {
match = 0;
hostent = *host;
if (strcasecmp((*host)->h_name, name) == 0) if (strcasecmp((*host)->h_name, name) == 0)
{ break;
match = 1; for (alias = (*host)->h_aliases; *alias; alias++)
}
else
{
for (alias = (*host)->h_aliases; *alias; alias++)
{ {
if (strcasecmp(*alias, name) == 0) if (strcasecmp(*alias, name) == 0)
{
match = 1;
break; break;
}
} }
} if (*alias)
if (match) break;
{ ares_free_hostent(*host);
if(!add_host(hostent, host))
ares_free_hostent(hostent);
else {
*host = NULL;
}
}
else
{
ares_free_hostent(*host);
*host = NULL;
}
} }
fclose(fp); fclose(fp);
if (status == ARES_EOF) if (status == ARES_EOF)
{ status = ARES_ENOTFOUND;
if ( *host)
status = ARES_SUCCESS;
else
status = ARES_ENOTFOUND;
}
if (status != ARES_SUCCESS) if (status != ARES_SUCCESS)
*host = NULL; *host = NULL;
return status; return status;