Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/libev/ev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2250,18 +2250,20 @@ inline_size int
array_nextsize (int elem, int cur, int cnt)
{
int ncur = cur + 1;
long size;

do
ncur <<= 1;
while (cnt > ncur);

size = (long)elem * ncur;

/* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
if (size > MALLOC_ROUND - sizeof (void *) * 4)
{
ncur *= elem;
ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
ncur = ncur - sizeof (void *) * 4;
ncur /= elem;
size = (size + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
size = size - sizeof (void *) * 4;
ncur = (int)(size / elem);
}

return ncur;
Expand Down