osal Integration candidate: Caelum-rc4+dev7 #1239
Merged
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
HOTFIX IC:Caelum-rc4+dev6, Fix failed format check
Fix #1235, Update copyright header
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
IC:Caelum-rc4+dev7, nasa/cFS#445
astrogeco
force-pushed
the
integration-candidate
branch
from
0371af9
to
76c56bf
Compare
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
**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 nasa/elf2cfetbl#108, v3.3.0-rc4+dev18 **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 nasa/elf2cfetbl#107 *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 nasa/elf2cfetbl#106
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 nasa/elf2cfetbl#108, v3.3.0-rc4+dev18 nasa/tblCRCTool#67, v1.3.0-rc4+dev14 nasa/cFS-GroundSystem#209, v3.0.0-rc4+dev19 **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 nasa/elf2cfetbl#107 nasa/tblCRCTool#66 nasa/cFS-GroundSystem#210 *Update Copyright Headers* nasa/cFE#2070 nasa/osal#1236 nasa/PSP#328 nasa/sample_app#169 nasa/sample_lib#78 nasa/ci_lab#106 nasa/to_lab#117 nasa/sch_lab#110 nasa/elf2cfetbl#106 nasa/tblCRCTool#65 nasa/cFS-GroundSystem#208 Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
2 tasks
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 nasa/elf2cfetbl#108, v3.3.0-rc4+dev18 nasa/tblCRCTool#67, v1.3.0-rc4+dev14 nasa/cFS-GroundSystem#209, v3.0.0-rc4+dev19 **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 nasa/elf2cfetbl#107 nasa/tblCRCTool#66 nasa/cFS-GroundSystem#210 *Update Copyright Headers* nasa/cFE#2070 nasa/osal#1236 nasa/PSP#328 nasa/sample_app#169 nasa/sample_lib#78 nasa/ci_lab#106 nasa/to_lab#117 nasa/sch_lab#110 nasa/elf2cfetbl#106 nasa/tblCRCTool#65 nasa/cFS-GroundSystem#208 Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#1239, scrub include header guards
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.
Describe the contribution
PR #1234
PR #1236
PR #1238
UtAssert_StringBufCompareSEGV when -1 for size passed in (on CentOS 7) #1237, avoid calling memchr() with unknown size bufferPR #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