Skip to content

osal Integration candidate: Equuleus-rc1+dev28 #1505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 7, 2025
Merged

osal Integration candidate: Equuleus-rc1+dev28 #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745ca62
Fix #1476, Update malloc stub
pepepr08 Mar 13, 2025
d512912
Merge pull request #1497 from pepepr08:1496-malloc-stub-update
dzbaker Apr 3, 2025
59d9bb9
Updating documentation and version numbers for equuleus-rc1+dev113
dzbaker Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Development Build: equuleus-rc1+dev113
- 'Fix #1496, Update malloc stub'
- See: <https://github.com/nasa/osal/pull/1497>


## Development Build: equuleus-rc1+dev101
- Update Select functions params
- update ut_oscore_test.c
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 101
#define OS_BUILD_NUMBER 113
#define OS_BUILD_BASELINE "equuleus-rc1"
#define OS_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define OS_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
6 changes: 5 additions & 1 deletion src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ void *OCS_malloc(size_t sz)
PoolStart = (PoolStart + MPOOL_ALIGN - 1) & ~((cpuaddr)MPOOL_ALIGN - 1);
PoolSize = PoolEnd - PoolStart;

if (PoolSize > (MPOOL_ALIGN * 2))
/*
* Verify PollSize is greater than minimun size and
* that PoolStart didn't go past the PoolEnd during alignment.
*/
if (PoolSize > (MPOOL_ALIGN * 2) && PoolStart < PoolEnd)
{
Rec = (struct MPOOL_REC *)PoolStart;
NextBlock = PoolStart + MPOOL_ALIGN;
Expand Down
Loading