girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-16 15:57:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

getdata: realloc instead of asserting

Browse source 
Ahmed reported he saw the following error with version 2.15 which
is an indication of unusual high number of clients that has been
seen. I am not sure where that happen, but I suspect an airport
or some other 'lots of mobiles getting leases' might be able to
case same situation.

dhcpd-pools: getdata.c:136: parse_leases: Assertion `!(touchesmallocsize < num_touches)' failed.

The problem was quite easy to fix simply getting rid of assert
and putting realloc in place.

Reported-by: Ahmed AL Dakhil <a.aldakhil@go.com.sa>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-07-08 14:36:47 +02:00
parent 8d94580c3d
commit c28488cbe8
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/getdata.c
View file

@ -78,9 +78,9 @@ int parse_leases(void)
struct in_addr inp;
struct stat lease_file_stats;
struct macaddr_t *macaddr_p = NULL;
unsigned long leasesmallocsize;
unsigned long touchesmallocsize;
unsigned long backupsmallocsize;
size_t leasesmallocsize;
size_t touchesmallocsize;
size_t backupsmallocsize;
int sw_active_lease = 0;
num_touches = num_leases = num_backups = 0;
@ -144,12 +144,21 @@ int parse_leases(void)
else if (strstr(line, "binding state active")) {
leases[num_leases] = htonl(inp.s_addr);
num_leases++;
assert(!(leasesmallocsize < num_leases));
if (leasesmallocsize < num_leases) {
leasesmallocsize =
sizeof(unsigned long int) * num_leases * 2;
leases = safe_realloc(leases, leasesmallocsize);
}
sw_active_lease = 1;
} else if (strstr(line, " binding state free")) {
touches[num_touches] = htonl(inp.s_addr);
num_touches++;
assert(!(touchesmallocsize < num_touches));
if (touchesmallocsize < num_touches) {
touchesmallocsize =
sizeof(unsigned long int) * num_touches * 2;
touches =
safe_realloc(touches, touchesmallocsize);
}
} else if (strstr(line, " binding state backup")) {
if (num_backups == 0) {
backups =
@ -158,7 +167,12 @@ int parse_leases(void)
}
backups[num_backups] = htonl(inp.s_addr);
num_backups++;
assert(!(backupsmallocsize < num_backups));
if (backupsmallocsize < num_backups) {
backupsmallocsize =
sizeof(unsigned long int) * num_backups * 2;
backups =
safe_realloc(backups, backupsmallocsize);
}
}
if ((macaddr != NULL)