[musl] [PATCH] mallocng/aligned_alloc: check for malloc failure

[musl] [PATCH] mallocng/aligned_alloc: check for malloc failure

[Dominic Chen]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

With mallocng, calling posix_memalign() or aligned_alloc() will SIGSEGV 
if the internal malloc() call returns NULL. This does not occur with 
oldmalloc, which explicitly checks for allocation failure.

Thanks,

Dominic


[-- Attachment #2: 0001-mallocng-aligned_alloc-check-for-malloc-failure.patch --]
[-- Type: text/plain, Size: 785 bytes --]

From 83a79b341f75ad243fba8603d889bfdebae3f35b Mon Sep 17 00:00:00 2001
From: Dominic Chen <d.c.ddcc@gmail.com>
Date: Thu, 25 Mar 2021 18:20:14 -0400
Subject: [PATCH] mallocng/aligned_alloc: check for malloc failure

---
 src/malloc/mallocng/aligned_alloc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/malloc/mallocng/aligned_alloc.c b/src/malloc/mallocng/aligned_alloc.c
index 34116896..e0862a83 100644
--- a/src/malloc/mallocng/aligned_alloc.c
+++ b/src/malloc/mallocng/aligned_alloc.c
@@ -22,6 +22,9 @@ void *aligned_alloc(size_t align, size_t len)
 	if (align <= UNIT) align = UNIT;
 
 	unsigned char *p = malloc(len + align - UNIT);
+	if (!p)
+		return 0;
+
 	struct meta *g = get_meta(p);
 	int idx = get_slot_index(p);
 	size_t stride = get_stride(g);
-- 
2.25.1

Re: [musl] [PATCH] mallocng/aligned_alloc: check for malloc failure

[Rich Felker]

On Thu, Mar 25, 2021 at 06:26:04PM -0400, Dominic Chen wrote:
> With mallocng, calling posix_memalign() or aligned_alloc() will
> SIGSEGV if the internal malloc() call returns NULL. This does not
> occur with oldmalloc, which explicitly checks for allocation
> failure.
> 
> Thanks,

Thanks, applying!

Rich