From 981abc39f6672c959201c7b82c7d70969af722f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Tue, 23 Mar 2021 00:41:07 -0400
Subject: [PATCH] Return an error if calloc() fails allocating pollfd array.
---
src/xpdev/multisock.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/xpdev/multisock.c b/src/xpdev/multisock.c
index d893be4a3d..676c5ed74f 100644
--- a/src/xpdev/multisock.c
+++ b/src/xpdev/multisock.c
@@ -362,6 +362,8 @@ SOCKET DLLCALL xpms_accept(struct xpms_set *xpms_set, union xp_sockaddr * addr,
if(FD_ISSET(xpms_set->socks[i].sock, &read_fs)) {
#else
fds = calloc(xpms_set->sock_count, sizeof(*fds));
+ if (fds == NULL)
+ return INVALID_SOCKET;
for (i = 0; i < xpms_set->sock_count; i++) {
if (xpms_set->socks[i].sock == INVALID_SOCKET)
continue;
--
GitLab