Fix #1840, Add Null check for CFE_ResourceId_FindNext#1842
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Aug 18, 2021
Merged
Conversation
zanzaben
force-pushed
the
fix1840_ResourceID_FindNext_null_check
branch
from
c25c8e5 to
aa72f85
Compare
pepepr08
approved these changes
Aug 18, 2021
skliper
reviewed
Aug 18, 2021
Comment on lines
+124
to
+128
| if (CheckFunc == NULL) | ||
| { | ||
| return CFE_ES_BAD_ARGUMENT; | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Suggest returning CFE_RESOURCEID_UNDEFINED... otherwise this is a conversion from an error code to a resource id type.
Contributor
|
@astrogeco - maybe a hot fix? Otherwise I don't think this will work with strict resource IDs. |
Contributor
Author
Crud, it doesn't work with strict resource IDs. I have a fix ready. Should I push it here? |
Contributor
|
push it to IC |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 20, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 21, 2021
**Combines** nasa/cFE# v6.8.0-rc1+dev933 nasa/osal# v5.1.0-rc1+dev594 **Includes** *osal* nasa/osal#1131, add test case types similar to NA *cFE* nasa/cFE#1803, Add software bus tests nasa/cFE#1756, separate variable for OSAL status nasa/cFE#1809, increase SB pool max size bucket nasa/cFE#1842, Add Null check for CFE_ResourceId_FindNext nasa/cFE#1828, Improve TBL coverage tests nasa/cFE#1833, Clean up Message ID Functional Test #1824, Add missing cases for msg id func tests nasa/cFE#1832, Combine SB Set/Get message characteristics group #1831, Consolidate msg get/set doxygen group nasa/cFE#1836, Adding coverage tests to cFE TIME nasa/cFE#1848, enable strict resource id w/OMIT_DEPRECATED nasa/cFE#1845, HOTFIX IC-20210819, type correction TBL coverage test nasa/cFE#1806, Add test for ES BackgroundWakeup nasa/cFE#1813, Success Test for CFE_ES_RestartApp nasa/cFE#1814, Subscribe to Message Limit Greater Than CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT nasa/cFE#1811, Success Test for CFE_ES_GetMemPoolStats nasa/cFE#1822, Group MSG APIs documentation by header type nasa/cFE#1816, add retroactive CFE status asserts nasa/cFE#1854, remove unused CFE_TBL_ERR_BAD_APP_ID nasa/cFE#1855, correct syslog message in pool create nasa/cFE#1853, remove unused CFE_ES_POOL_BOUNDS_ERROR nasa/cFE#1859, remove unused CFE_TBL_ERR_FILE_NOT_FOUND nasa/cFE#1856, Check error ctr to TransmitMsg test nasa/cFE#1857, End Child Task requirement remove error code nasa/cFE#1782, Add functional tests for resource misc Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Alex Campbell <[email protected]> Co-authored-by: Niall Mullane <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Jose F Martinez Pedraza <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Fixes #1840
Adds Null check to CFE_ResourceId_FindNext
Testing performed
Build and run unit test
Expected behavior changes
No impact to behavior
System(s) tested on
Ubuntu 20.04
Additional context
If this gets into master before #1782 then a Functional Test will need to be added there. Otherwise it should be added here.
Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell GSFC