Fix #1304, locks for condvar objects on rtems/vxworks #1311
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instantiate the condvar lock on rtems and vxworks even though the feature is not currently implemented. This is because OS_MAX_CONDVARS must still be nonzero and if the "Create" function is called, it still goes through the motions of allocating an ID. This also adds a NULL check in the lock implementation, and thus if a lock is not instantiated in the future this will not dereference a NULL pointer.
dzbaker
added
the
CCB:Approved
2 tasks
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Oct 17, 2022
*Combines:* cfe v7.0.0-rc4+dev197 osal v7.0.0-rc4+dev143 psp v1.6.0-rc4+dev61 elf2cfetbl v3.4.0-rc4+dev30 sch_lab v2.5.0-rc4+dev45 **Includes:** *cFS* - #589 *cFE* - nasa/cFE#2165 *osal* - nasa/osal#1311 - nasa/osal#1310 - nasa/osal#1313 - nasa/osal#1306 - nasa/osal#1309 *psp* - nasa/PSP#365 - nasa/PSP#368 *sch_lab* - nasa/sch_lab#126 *elf2cfetbl* - nasa/elf2cfetbl#119 Co-authored-by: Avi Weiss <thnkslprpt@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Ariel Adams <arielsadamsnasa@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Oct 17, 2022
*Combines:* cfe v7.0.0-rc4+dev197 osal v7.0.0-rc4+dev143 psp v1.6.0-rc4+dev61 elf2cfetbl v3.4.0-rc4+dev30 sch_lab v2.5.0-rc4+dev45 **Includes:** *cFS* - #589 *cFE* - nasa/cFE#2165 *osal* - nasa/osal#1311 - nasa/osal#1310 - nasa/osal#1313 - nasa/osal#1306 - nasa/osal#1309 *psp* - nasa/PSP#365 - nasa/PSP#368 *sch_lab* - nasa/sch_lab#126 *elf2cfetbl* - nasa/elf2cfetbl#119 Co-authored-by: Avi Weiss <thnkslprpt@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Ariel Adams <arielsadamsnasa@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Instantiate the condvar lock on rtems and vxworks even though the feature is not currently implemented. This is because OS_MAX_CONDVARS must still be nonzero and if the "Create" function is called, it still goes through the motions of allocating an ID.
This also adds a NULL check in the lock implementation, and thus if a lock is not instantiated in the future this will not dereference a NULL pointer.
Fixes #1304
Testing performed
Build and run all tests
Expected behavior changes
Missing lock is instantiated
Add null check - Avoids possible null dereference in the event of a missing lock in the future
System(s) tested on
Ubuntu 22.04
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.