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.

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

osal Integration candidate: Caelum-rc4+dev7 #1239

Merged
merged 11 commits into from
Mar 25, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 25, 2022

Describe the contribution

PR #1234

PR #1236

PR #1238

PR #1240

Testing performed
osal Checks https://github.com/nasa/osal/pull/1239/checks
cFS Bundle checks https://github.com/nasa/cFS/445/checks

Failed CodeQL workflow is being examined.

Expected behavior changes
See PRs

System(s) tested on

Additional context
Part of nasa/cFS#445

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@astrogeco
@jphickey
@skliper

astrogeco and others added 11 commits March 18, 2022 10:41
HOTFIX IC:Caelum-rc4+dev6, Fix failed format check
In some systems, passing a large size value to memchr() causes it to
return NULL, even if the char is guaranteed to be found within the
actual valid buffer memory.

This modifies the string buffer comparison function to actively
check for this sentinel value and use "strlen()" instead.
Fix #1237, avoid calling memchr() with unknown size buffer
HOTFIX #1233, Revert changes to versioning information
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
**Combines**

nasa/cFE#2074, v7.0.0-rc4+dev94
nasa/osal#1239, v6.0.0-rc4+dev66
nasa/PSP#330, v1.6.0-rc4+dev21

nasa/ci_lab#107, v2.5.0-rc4+dev17
nasa/sample_app#171, v1.3.0-rc4+dev16
nasa/sample_lib#80, v1.3.0-rc4+dev16
nasa/to_lab#119, v2.5.0-rc4+dev16
nasa/sch_lab#112, v2.5.0-rc4+dev23

**Includes**

*Standardize Version Information*

nasa/cFE#2071
nasa/osal#1240
nasa/PSP#329

nasa/sample_app#170
nasa/sample_lib#79

nasa/ci_lab#108
nasa/to_lab#118
nasa/sch_lab#111

*Update Copyright Headers*

nasa/PSP#328

nasa/sample_app#169
nasa/sample_lib#78

nasa/ci_lab#106
nasa/to_lab#117
nasa/sch_lab#110
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
@astrogeco astrogeco merged commit 88f72d7 into main Mar 25, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
@skliper skliper added this to the Draco milestone Mar 28, 2022
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UtAssert_StringBufCompare SEGV when -1 for size passed in (on CentOS 7) Apply latest copyright header
3 participants