pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-07-31 15:32:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Resolver fix nr (prolly not "the real problem").

Browse source
This commit is contained in:
Bram Matthys 2003-06-01 18:49:46 +00:00
parent a6d33b3841
commit 00f857ae99
2 changed files with 18 additions and 6 deletions

1
Changes
View file

@ -2204,3 +2204,4 @@ seen. gmtime warning still there
- Fixed some MOTD problems: remote MOTD gone after rehash (#0001007) and motd time, etc...
- Fixed _some_ gcc3.3 + -Wall warnings.
- Fixed a bug where the win32 config editor could crash if the file contained color codes.
- Resolver fix nr #1 (prolly not "the real problem").

23
src/res.c
View file

@ -2038,10 +2038,10 @@ int res_copyhostent(struct hostent *from, struct hostent *to)
for (x = 0; from->h_aliases[x]; x++)
;
x *= sizeof(char *);
amt += sizeof(char *);
amt += sizeof(char *) + x;
for (i = 0; from->h_aliases[i]; i++)
{
to->h_aliases[i] = (char *)(amt+x);
to->h_aliases[i] = (char *)amt;
strcpy(to->h_aliases[i], from->h_aliases[i]);
amt += strlen(to->h_aliases[i])+1;
if (amt&0x3)
@ -2053,19 +2053,30 @@ int res_copyhostent(struct hostent *from, struct hostent *to)
for (x = 0; from->h_addr_list[x]; x++)
;
x *= sizeof(char *);
amt += sizeof(char *) + x;
for (i = 0; from->h_addr_list[i]; i++)
{
amt += 4;
to->h_addr_list[i] = (char *)(amt+x);
to->h_addr_list[i] = (char *)amt;
#ifndef INET6
((struct IN_ADDR *)to->h_addr_list[i])->S_ADDR = ((struct IN_ADDR *)from->h_addr_list[i])->S_ADDR;
#else
bcopy(((struct IN_ADDR *)from->h_addr_list[i])->S_ADDR,((struct IN_ADDR *)to->h_addr_list[i])->S_ADDR, IN6ADDRSZ);
#endif
amt += sizeof(struct IN_ADDR); /* Prolly 4 */
}
to->h_addr_list[i] = NULL;
#ifdef WINDNSDEBUG
{
int aliascnt = 0, addrcnt = 0;
for (aliascnt = 0; from->h_aliases[aliascnt]; aliascnt++);
for (addrcnt = 0; from->h_addr_list[addrcnt]; addrcnt++);
ircd_log(LOG_ERROR, "resolver: amt=0x%x, to=0x%x, len=%d, max=%d [%d aliases, %d addrs]",
amt, to, (char *)amt - (char *)to, MAXGETHOSTSTRUCT, aliascnt, addrcnt);
}
#endif
if ((char *)amt + 4 > (char *)to + MAXGETHOSTSTRUCT)
ircd_log(LOG_ERROR, "resolver: overflow???");
return 1;
}
#endif /*_WIN32*/