Fix crash when same pack is located on 2 paths #1063
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
brondani
reviewed
Jul 13, 2023
There was a problem hiding this comment.
@Torbjorn-Svensson Thanks for this finding and contribution.
Please see my suggestion below and also add or extended a test case to cover the new code.
Scenario: csolution.yml: packs: - pack: ARM::[email protected] path: ./ARM.CMSIS.5.9.0/ cproject.yml: packs: - pack: [email protected] In the above scenario, the same pack is defined on 2 different paths. The one in the csolution.yml is a project local path, and for the cproject.yml, it can be found in the $CMSIS_PACK_ROOT. As the RteModel does not allow "duplicates", the RtePackage pointer, for the second pdsc file to be loaded, will be released when calling RteModel->Validate() and thus, only instances that is known by the model should be contained in m_loadedPacks in the ProjMgrWorker instance. Contributed by STMicroelectronics Signed-off-by: Torbjörn SVENSSON <[email protected]> Co-authored-by: Daniel Brondani <[email protected]>
Torbjorn-Svensson
force-pushed
the
pr/fix-crash-when-same-pack
branch
from
c9918a4
to
3eda6d6
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #1063 +/- ##
==========================================
- Coverage 54.61% 54.61% -0.01%
==========================================
Files 116 116
Lines 22703 22701 -2
Branches 12607 12608 +1
==========================================
- Hits 12400 12398 -2
Misses 8148 8148
Partials 2155 2155
Flags with carried forward coverage won't be shown. Click here to find out more.
|
edriouk
approved these changes
Jul 14, 2023
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.
Scenario:
csolution.yml:
cproject.yml:
In the above scenario, the same pack is defined on 2 different paths. The one in the csolution.yml is a project local path, and for the cproject.yml, it can be found in the $CMSIS_PACK_ROOT.
As the RteModel does not allow "duplicates", the RtePackage pointer, for the second pdsc file to be loaded, will be released when calling RteModel->Validate() and thus, only instances that is known by the model should be contained in m_loadedPacks in the ProjMgrWorker instance.
Contributed by STMicroelectronics