Skip to content

Fix NO_CAST.INTEGER_OVERFLOW in libev ev.c array_nextsize #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikhailnov wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix NO_CAST.INTEGER_OVERFLOW in libev ev.c array_nextsize #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/libev/ev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,10 +2256,10 @@ array_nextsize (int elem, int cur, int cnt)
while (cnt > 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_t)elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
{
ncur *= elem;
ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
ncur = ((size_t)ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
ncur = ncur - sizeof (void *) * 4;
ncur /= elem;
}
Expand All @@ -2272,7 +2272,7 @@ static void *
array_realloc (int elem, void *base, int *cur, int cnt)
{
*cur = array_nextsize (elem, *cur, cnt);
return ev_realloc (base, elem * *cur);
return ev_realloc (base, (size_t)elem * *cur);
}

#define array_needsize_noinit(base,offset,count)
Expand Down