From b692380651d4a6e378aeb9acfe6ffaef94fdced9 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 17 Jul 2025 15:18:02 +0200 Subject: [PATCH] demos: use array memory (re)allocation routines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eugene Syromiatnikov Reviewed-by: Saša Nedvědický Reviewed-by: Matt Caswell Reviewed-by: Paul Dale Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/28059) --- .../poll-server/quic-server-ssl-poll-http.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/demos/quic/poll-server/quic-server-ssl-poll-http.c b/demos/quic/poll-server/quic-server-ssl-poll-http.c index dd430c847b..8b7cd68b47 100644 --- a/demos/quic/poll-server/quic-server-ssl-poll-http.c +++ b/demos/quic/poll-server/quic-server-ssl-poll-http.c @@ -975,7 +975,8 @@ create_poll_manager(void) return NULL; ossl_list_pe_init(&pm->pm_head); - pm->pm_poll_set = OPENSSL_malloc(sizeof (struct poll_event) * POLL_GROW); + pm->pm_poll_set = OPENSSL_malloc_array(POLL_GROW, + sizeof (struct poll_event)); if (pm->pm_poll_set != NULL) { pm->pm_poll_set_sz = POLL_GROW; pm->pm_event_count = 0; @@ -992,7 +993,6 @@ rebuild_poll_set(struct poll_manager *pm) { struct poll_event *new_poll_set; struct poll_event *pe; - size_t new_sz; size_t pe_num; size_t i; @@ -1004,9 +1004,9 @@ rebuild_poll_set(struct poll_manager *pm) /* * grow poll set by POLL_GROW */ - new_sz = sizeof (struct poll_event) * (pm->pm_poll_set_sz + POLL_GROW); - new_poll_set = (struct poll_event *)OPENSSL_realloc(pm->pm_poll_set, - new_sz); + new_poll_set = OPENSSL_realloc_array(pm->pm_poll_set, + pm->pm_poll_set_sz + POLL_GROW, + sizeof (struct poll_event)); if (new_poll_set == NULL) return -1; pm->pm_poll_set = new_poll_set; @@ -1016,10 +1016,9 @@ rebuild_poll_set(struct poll_manager *pm) /* * shrink poll set by POLL_DOWNSIZ */ - new_sz = sizeof (struct poll_event) * - (pm->pm_poll_set_sz - POLL_DOWNSIZ); - new_poll_set = (struct poll_event *)OPENSSL_realloc(pm->pm_poll_set, - new_sz); + new_poll_set = OPENSSL_realloc_array(pm->pm_poll_set, + pm->pm_poll_set_sz - POLL_DOWNSIZ, + sizeof (struct poll_event)); if (new_poll_set == NULL) return -1; pm->pm_poll_set = new_poll_set; -- 2.47.2