holm/endlessh
1
1
Fork 0
forked from extern/endlessh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't forget to double the known capacity

Browse Source
This commit is contained in:
Christopher Wellons 2019-02-02 23:18:56 -05:00
parent 8c37ff055a
commit dca3ca646f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
endlessh.c
View File

@ -97,7 +97,7 @@ pollvec_init(struct pollvec *v)
{ {
v->cap = 4; v->cap = 4;
v->fill = 0; v->fill = 0;
v->fds = malloc(v->cap * sizeof(*v->fds)); v->fds = malloc(v->cap * sizeof(v->fds[0]));
if (!v->fds) { if (!v->fds) {
fprintf(stderr, "endlessh: pollvec initialization failed\n"); fprintf(stderr, "endlessh: pollvec initialization failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -114,13 +114,14 @@ static int
pollvec_push(struct pollvec *v, int fd, short events) pollvec_push(struct pollvec *v, int fd, short events)
{ {
if (v->cap == v->fill) { if (v->cap == v->fill) {
size_t size = v->cap * 2 * sizeof(*v->fds); size_t size = v->cap * 2 * sizeof(v->fds[0]);
if (size < v->cap * sizeof(*v->fds)) if (size < v->cap * sizeof(v->fds[0]))
return 0; // overflow return 0; // overflow
struct pollfd *grow = realloc(v->fds, size); struct pollfd *grow = realloc(v->fds, size);
if (!grow) if (!grow)
return 0; return 0;
v->fds = grow; v->fds = grow;
v->cap *= 2;
} }
v->fds[v->fill].fd = fd; v->fds[v->fill].fd = fd;
v->fds[v->fill].events = events; v->fds[v->fill].events = events;