Skip to content
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

Jump to bottom

IC - 20200226 #361

Merged
merged 3 commits into from
Feb 28, 2020
Merged

IC - 20200226 #361

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
fe93928
Fix #337: fix memory corruption produced by misplaced memset()
stanislaw Jan 2, 2020
ae68a3f
Merge pull request #338 from stanislaw/fix-pthread-cond-init-issue
astrogeco Feb 25, 2020
7d1f33d
Increase version to 5.0.7 and update README
astrogeco Feb 28, 2020
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: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ This distribution contains:

Version Notes:
==============

- 5.0.7: DEVELOPMENT
- Fixes memset bug
- Minor updates (see https://github.com/nasa/osal/pull/361)
- 5.0.6: DEVELOPMENT
- Minor updates (see https://github.com/nasa/osal/pull/355)
- 5.0.5: DEVELOPMENT
Expand Down Expand Up @@ -117,4 +119,3 @@ License information:
====================

This software is licensed under NASAs Open Source Agreement. The release of the software is conditional upon the recipients acceptance of the Open Source Agreement. Please see the file: NASA_Open_Source_Agreement_1_3-OS_AbstractionLayer.txt

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 @@ -20,7 +20,7 @@

#define OS_MAJOR_VERSION 5
#define OS_MINOR_VERSION 0
#define OS_REVISION 6
#define OS_REVISION 7
#define OS_MISSION_REV 0

/**
Expand Down
3 changes: 2 additions & 1 deletion src/os/posix/osapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,6 +1465,8 @@ int32 OS_BinSemCreate_Impl (uint32 sem_id, uint32 initial_value, uint32 options)
mutex_created = 0;
cond_created = 0;
sem = &OS_impl_bin_sem_table[sem_id];
memset(sem, 0, sizeof (*sem));

do
{
/*
Expand Down Expand Up @@ -1522,7 +1524,6 @@ int32 OS_BinSemCreate_Impl (uint32 sem_id, uint32 initial_value, uint32 options)
** fill out the proper OSAL table fields
*/

memset(sem, 0, sizeof (*sem));
sem->current_value = initial_value;

return_code = OS_SUCCESS;
Expand Down