user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/4] xap_helper.h: add missing headers and avoid reallocarray
Date: Sun, 24 Sep 2023 21:08:22 +0000	[thread overview]
Message-ID: <20230924210822.2771981-5-e@80x24.org> (raw)
In-Reply-To: <20230924210822.2771981-1-e@80x24.org>

These changes are necessary with glibc 2.17 and g++ 4.8.5
on CentOS 7.x.  We don't have to worry about overflow with
realloc(3) here since WORKER_MAX is only USHRT_MAX and
sizeof(pid_t) is 4 bytes on every platform I've encountered.
---
 lib/PublicInbox/xap_helper.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/xap_helper.h b/lib/PublicInbox/xap_helper.h
index 377ff45a..5f04316c 100644
--- a/lib/PublicInbox/xap_helper.h
+++ b/lib/PublicInbox/xap_helper.h
@@ -35,7 +35,10 @@
 #include <limits.h>
 #include <search.h>
 #include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
@@ -1084,9 +1087,9 @@ static void do_sigttin(void)
 		warnx("workers cannot exceed %zu", (size_t)WORKER_MAX);
 		return;
 	}
-	void *p = reallocarray(worker_pids, nworker + 1, sizeof(pid_t));
+	void *p = realloc(worker_pids, (nworker + 1) * sizeof(pid_t));
 	if (!p) {
-		warn("reallocarray");
+		warn("realloc worker_pids");
 	} else {
 		worker_pids = (pid_t *)p;
 		worker_pids[nworker++] = 0;

      parent reply	other threads:[~2023-09-24 21:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-24 21:08 [PATCH 0/4] various CentOS 7.x related fixes Eric Wong
2023-09-24 21:08 ` [PATCH 1/4] test_common: force IPv4 with pre-IPv6 Net::POP3 Eric Wong
2023-09-24 21:08 ` [PATCH 2/4] install/deps: fix RPM installation of some packages Eric Wong
2023-09-24 21:08 ` [PATCH 3/4] lei: use scalar %SIG assignment Eric Wong
2023-09-24 21:08 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230924210822.2771981-5-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).