Skip to content

Fix #687, validate table handle prior to use#688

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
CDKnightNASA:fix-687-tblhandle_verify
May 19, 2020
Merged

Fix #687, validate table handle prior to use#688
astrogeco merged 1 commit intonasa:integration-candidatefrom
CDKnightNASA:fix-687-tblhandle_verify

Conversation

@CDKnightNASA
Copy link
Contributor

@CDKnightNASA CDKnightNASA commented May 7, 2020 •
edited by skliper
Loading

Describe the contribution
fixes a bug where a table handle is used prior to validation (used in the variable initialization at the top of CFE_TBL_Load() .)

Fix #687

Contributor Info - All information REQUIRED for consideration of pull request
[email protected]

@CDKnightNASA CDKnightNASA added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label May 7, 2020
@CDKnightNASA CDKnightNASA requested review from jphickey and skliper May 7, 2020 17:36
@CDKnightNASA CDKnightNASA self-assigned this May 7, 2020
@skliper
Copy link
Contributor

skliper commented May 7, 2020

Squash these (just don't assign NULL):

[fsw/cfe-core/src/tbl/cfe_tbl_api.c:681] -> [fsw/cfe-core/src/tbl/cfe_tbl_api.c:689]: (style) Variable 'AccessDescPtr' is reassigned a value before the old one has been used.
[fsw/cfe-core/src/tbl/cfe_tbl_api.c:682] -> [fsw/cfe-core/src/tbl/cfe_tbl_api.c:690]: (style) Variable 'RegRecPtr' is reassigned a value before the old one has been used.
[fsw/cfe-core/src/tbl/cfe_tbl_api.c:680] -> [fsw/cfe-core/src/tbl/cfe_tbl_api.c:696]: (style) Variable 'WorkingBufferPtr' is reassigned a value before the old one has been used.

jphickey
jphickey previously requested changes May 7, 2020
View reviewed changes
@CDKnightNASA CDKnightNASA force-pushed the fix-687-tblhandle_verify branch from 4326e5d to 69cd57b Compare May 7, 2020 19:23
@CDKnightNASA
Copy link
Contributor Author

CDKnightNASA commented May 7, 2020

updated, squashed, pushed, better? :)

jphickey
jphickey reviewed May 7, 2020
View reviewed changes
@CDKnightNASA CDKnightNASA force-pushed the fix-687-tblhandle_verify branch from 69cd57b to 84809a7 Compare May 7, 2020 21:36
@skliper skliper added this to the 6.8.0 milestone May 12, 2020
@astrogeco astrogeco changed the title fix #687 - validate table handle prior to use Fix #687 - validate table handle prior to use May 13, 2020
@astrogeco astrogeco changed the title Fix #687 - validate table handle prior to use Fix #687, validate table handle prior to use May 13, 2020
@skliper skliper added CCB-20200513 enhancement and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels May 13, 2020
@skliper
Copy link
Contributor

skliper commented May 13, 2020

CCB 20200513 - Approved

@astrogeco astrogeco dismissed jphickey’s stale review May 19, 2020 20:07

Changes applied

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB IC-20200513 labels May 19, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate May 19, 2020 20:07
@astrogeco astrogeco merged commit 0fa7baf into nasa:integration-candidate May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jphickey jphickey jphickey left review comments

+1 more reviewer

@skliper skliper skliper approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@CDKnightNASA CDKnightNASA

Labels

CCB:Approved Indicates code review and approval by community CCB

Projects

None yet

Milestone

Bootes

Development

Successfully merging this pull request may close these issues.

TblHandle used before validation in CFE_TBL_Load

4 participants

@CDKnightNASA @skliper @jphickey @astrogeco