isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use non-exiting allocators.

Browse Source
This commit is contained in:
Todd C. Miller
2015-06-05 13:17:56 -06:00
parent 8eff57f070
commit 564eb7e7dd
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/util/event_poll.c
View File

@@ -45,13 +45,10 @@
#include <poll.h> #include <poll.h>
#include "sudo_compat.h" #include "sudo_compat.h"
#include "sudo_alloc.h"
#include "sudo_fatal.h" #include "sudo_fatal.h"
#include "sudo_debug.h" #include "sudo_debug.h"
#include "sudo_event.h" #include "sudo_event.h"
/* XXX - use non-exiting allocators? */
int int
sudo_ev_base_alloc_impl(struct sudo_event_base *base) sudo_ev_base_alloc_impl(struct sudo_event_base *base)
{ {
@@ -60,7 +57,13 @@ sudo_ev_base_alloc_impl(struct sudo_event_base *base)
base->pfd_high = -1; base->pfd_high = -1;
base->pfd_max = 32; base->pfd_max = 32;
base->pfds = sudo_ereallocarray(NULL, base->pfd_max, sizeof(struct pollfd)); base->pfds = reallocarray(NULL, base->pfd_max, sizeof(struct pollfd));
if (base->pfds == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR,
"%s: unable to allocate %d pollfds", __func__, base->pfd_max);
base->pfd_max = 0;
debug_return_int(-1);
}
for (i = 0; i < base->pfd_max; i++) { for (i = 0; i < base->pfd_max; i++) {
base->pfds[i].fd = -1; base->pfds[i].fd = -1;
} }
@@ -72,7 +75,7 @@ void
sudo_ev_base_free_impl(struct sudo_event_base *base) sudo_ev_base_free_impl(struct sudo_event_base *base)
{ {
debug_decl(sudo_ev_base_free_impl, SUDO_DEBUG_EVENT) debug_decl(sudo_ev_base_free_impl, SUDO_DEBUG_EVENT)
sudo_efree(base->pfds); free(base->pfds);
debug_return; debug_return;
} }
@@ -84,10 +87,18 @@ sudo_ev_add_impl(struct sudo_event_base *base, struct sudo_event *ev)
/* If out of space in pfds array, realloc. */ /* If out of space in pfds array, realloc. */
if (base->pfd_free == base->pfd_max) { if (base->pfd_free == base->pfd_max) {
struct pollfd *pfds;
int i; int i;
base->pfd_max <<= 1;
base->pfds = pfds =
sudo_ereallocarray(base->pfds, base->pfd_max, sizeof(struct pollfd)); reallocarray(base->pfds, base->pfd_max, 2 * sizeof(struct pollfd));
if (pfds == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR,
"%s: unable to allocate %d pollfds", __func__, base->pfd_max * 2);
debug_return_int(-1);
}
base->pfds = pfds;
base->pfd_max *= 2;
for (i = base->pfd_free; i < base->pfd_max; i++) { for (i = base->pfd_free; i < base->pfd_max; i++) {
base->pfds[i].fd = -1; base->pfds[i].fd = -1;
} }