From 3327ffaa155b646d1ce04755388d1e0f8a522caa Mon Sep 17 00:00:00 2001
From: zhouji <956133287@qq.com>
Date: Sun, 12 Dec 2021 11:16:26 +0800
Subject: [update] 使用memheap内存管理时，rt_malloc 0长度返回RT_NULL,
 与slab与小内存管理等算法保持一致。
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/memheap.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/memheap.c')

diff --git a/src/memheap.c b/src/memheap.c
index 68a15d1a8e..9c3f570f29 100644
--- a/src/memheap.c
+++ b/src/memheap.c
@@ -850,6 +850,10 @@ void *rt_malloc(rt_size_t size)
 {
     void *ptr;
 
+    /* zero size, return RT_NULL */
+    if (size == 0)
+        return RT_NULL;
+
     /* try to allocate in system heap */
     ptr = rt_memheap_alloc(&_heap, size);
 #ifdef RT_USING_MEMHEAP_AUTO_BINDING
-- 
cgit v1.3.1


From ee1e85455a29335005da62a7c39aee08cdf98446 Mon Sep 17 00:00:00 2001
From: zhouji <956133287@qq.com>
Date: Sun, 12 Dec 2021 11:24:35 +0800
Subject: [update]
 使用memheap内存管理算法时，对rt_system_heap_init传入的地址进行对齐。
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/memheap.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/memheap.c')

diff --git a/src/memheap.c b/src/memheap.c
index 9c3f570f29..e96b402bcf 100644
--- a/src/memheap.c
+++ b/src/memheap.c
@@ -832,13 +832,16 @@ static struct rt_memheap _heap;
  */
 void rt_system_heap_init(void *begin_addr, void *end_addr)
 {
-    RT_ASSERT((rt_uint32_t)end_addr > (rt_uint32_t)begin_addr);
+    RT_ASSERT((rt_size_t)end_addr > (rt_size_t)begin_addr);
+
+    rt_size_t begin_align = RT_ALIGN((rt_size_t)begin_addr, RT_ALIGN_SIZE);
+    rt_size_t end_align   = RT_ALIGN_DOWN((rt_size_t)end_addr, RT_ALIGN_SIZE);
 
     /* initialize a default heap in the system */
     rt_memheap_init(&_heap,
                     "heap",
-                    begin_addr,
-                    (rt_uint32_t)end_addr - (rt_uint32_t)begin_addr);
+                    (void *)begin_align,
+                    end_align - begin_align);
 }
 
 /**
-- 
cgit v1.3.1