Merge pull request #1431 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev65
nasa · Dec 5, 2023 · edede38 · edede38
2 parents 0291622 + 2312ade
commit edede38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+##Development Build: v6.0.0-rc4+dev243
+- Wrong memory alignment calculation
+- See <https://github.com/nasa/osal/pull/1413>
+
 ## Development Build: v6.0.0-rc4+dev239
 - Add RTEMS console and timebase posix task names
 - See <https://github.com/nasa/osal/pull/1422>

diff --git 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"
 
 /*

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
@@ -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;