Prevent invalid binding relationship access in UsdShadeMaterialBindingAPI #2024
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
spiffmon
reviewed
Sep 6, 2022
| @@ -252,7 +252,7 @@ UsdShadeMaterialBindingAPI::DirectBinding::DirectBinding( | |||
| UsdShadeMaterial | |||
| UsdShadeMaterialBindingAPI::DirectBinding::GetMaterial() const | |||
| { | |||
| if (!_materialPath.IsEmpty()) { | |||
| if (_bindingRel && !_materialPath.IsEmpty()) { | |||
There was a problem hiding this comment.
Thank you, @tkchanat ! Can you change this pattern to if (_bindingRel.GetPrim() ... ? It is sufficient, and cheaper than a full Relationship validity test. Thank you!
There was a problem hiding this comment.
Thanks for the review @spiffmon! I changed the pattern in the latest commit and it's looking good now.
|
Filed as internal issue #USD-7614 |
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.
Description of Change(s)
The validity of the binding relationship is not verified before accessing the stage, which then throws a
Usd_ThrowExpiredPrimAccessErrorwhile dereferencing the prim data handle. Adding an extra check in the if-condition prevents such invalid access and returns an empty material if the binding relationship is invalid.