Coverity fixes plus fix for potential multithreading issue #38142
Conversation
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
Most fixes were for copying in instead of moving in to a method that I've recently added to fix Coverity warnings about null objects. The changes in FindPeaksConvolve were because m_pdf was being either read or written to without the lock.
jclarkeSTFC
added
Maintenance
This refactor will protect against a null cast in the case of a non-MultiDomainFunction being passed in.
| FunctionFactory::Instance().createFunction("ProductFunction")); | ||
| product->addFunction(norm); | ||
| product->addFunction(inBrace); | ||
| auto composite = Kernel::DynamicPointerCastHelper::dynamicPointerCastWithCheck<CompositeFunction, API::IFunction>( |
There was a problem hiding this comment.
Just a question to help me - why is this necessary?
Note this line is also present in PawleyFunction.cpp and a few other places
There was a problem hiding this comment.
If we do dynamic_pointer_cast<T> and then use the result without checking for null, then Coverity complains. In #38100 I added dynamicPointerCastWithCheck to include the null check before returning the pointer, (and save duplicating if ( thing == nullptr) in several places.
RichardWaiteSTFC
approved these changes
Oct 8, 2024
There was a problem hiding this comment.
Looks good to me, followed instructions for FindPeaksConvolve in #36352 - just a quick question for my own understanding!
peterfpeterson
pushed a commit
to peterfpeterson/mantid
that referenced
this pull request
Nov 26, 2024
This gets the changes from mantidproject#38142 into ornl-next Most fixes were for copying in instead of moving in to a method that I've recently added to fix Coverity warnings about null objects. The changes in FindPeaksConvolve were because m_pdf was being either read or written to without the lock. Refactor to avoid potential null cast This refactor will protect against a null cast in the case of a non-MultiDomainFunction being passed in.
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.
Most fixes were for copying in instead of moving in to a method that I've recently added to fix other Coverity warnings about null objects (#38100). The changes in
FindPeaksConvolvewere becausem_pdfwas being either read or written to without the lock, so a potential bug.To test:
Try running
FindPeaksConvolve, e..g the test code in #38135.This does not require release notes because it has no impact on the user.
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeeperswill take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.