From 51ec0e42697873b54c78b0f9205f81aab2e99bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20K=C3=BChndel?= Date: Mon, 11 Sep 2023 15:19:01 +0200 Subject: [PATCH 1/2] Fix #1412, Wrong memory alignment calculation --- src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c index 9b22b7188..8e042dcae 100644 --- a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c @@ -150,7 +150,7 @@ void *OCS_malloc(size_t sz) return NULL; } - NextSize = (NextSize + MPOOL_ALIGN - 1) & ~((size_t)MPOOL_ALIGN); + NextSize = (NextSize + MPOOL_ALIGN - 1) & ~((size_t)MPOOL_ALIGN - 1); NextBlock = Rec->BlockAddr + MPOOL_ALIGN; Rec->BlockAddr += NextSize; Rec->Size += NextSize; From 2312ade9b77541288edd9255fa9cd80fc4fc723e Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 5 Dec 2023 09:03:06 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for v6.0.0-rc4+dev243 --- CHANGELOG.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fe3c8796..dc33a0ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +##Development Build: v6.0.0-rc4+dev243 +- Wrong memory alignment calculation +- See + ## Development Build: v6.0.0-rc4+dev239 - Add RTEMS console and timebase posix task names - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 5ab1c1bb3..95d2ab90c 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,7 +34,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 239 +#define OS_BUILD_NUMBER 243 #define OS_BUILD_BASELINE "v6.0.0-rc4" /*