Skip to content

Commit a0eb503

Browse files
committed
samurai: Fix overlapping definition with libc.
1 parent 7db0fc5 commit a0eb503

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

devel/samurai/distinfo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
$NetBSD: distinfo,v 1.7 2021/10/26 10:19:54 nia Exp $
1+
$NetBSD: distinfo,v 1.8 2023/11/16 09:39:48 nia Exp $
22

33
BLAKE2s (samurai-1.2.tar.gz) = 97ec3ac8efd246ad9fdc87fef27161ce6ba95b82564fd8aabc0adc75a8583077
44
SHA512 (samurai-1.2.tar.gz) = bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
55
Size (samurai-1.2.tar.gz) = 32709 bytes
6+
SHA1 (patch-util.c) = 6d2e792d0c5138139c72ca2889e06c9ff99aa8a4

devel/samurai/patches/patch-util.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
$NetBSD: patch-util.c,v 1.1 2023/11/16 09:39:48 nia Exp $
2+
3+
Fix overlapping definition with libc.
4+
5+
--- util.c.orig 2020-12-17 01:31:33.000000000 +0000
6+
+++ util.c
7+
@@ -58,7 +58,7 @@ xmalloc(size_t n)
8+
}
9+
10+
static void *
11+
-reallocarray(void *p, size_t n, size_t m)
12+
+samurai_reallocarray(void *p, size_t n, size_t m)
13+
{
14+
if (m && n > SIZE_MAX / m) {
15+
errno = ENOMEM;
16+
@@ -70,7 +70,7 @@ reallocarray(void *p, size_t n, size_t m
17+
void *
18+
xreallocarray(void *p, size_t n, size_t m)
19+
{
20+
- p = reallocarray(p, n, m);
21+
+ p = samurai_reallocarray(p, n, m);
22+
if (!p)
23+
fatal("reallocarray:");
24+

0 commit comments

Comments
 (0)