[Error Handling] Fix DxcContainerBuilder error handling #7056
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
tex3d
requested changes
Jan 11, 2025
Comment on lines
107
to
+110
| DxcThreadMalloc TM(m_pMalloc); | ||
| if (ppResult == nullptr) | ||
| return E_INVALIDARG; | ||
|
|
There was a problem hiding this comment.
Suggested change
| DxcThreadMalloc TM(m_pMalloc); | |
| if (ppResult == nullptr) | |
| return E_INVALIDARG; | |
| if (ppResult == nullptr) | |
| return E_INVALIDARG; | |
| DxcThreadMalloc TM(m_pMalloc); |
Comment on lines
+168
to
+172
| LPVOID PTR = pResult->GetBufferPointer(); | ||
| if (!IsDxilContainerLike(PTR, pResult->GetBufferSize())) | ||
| return E_FAIL; | ||
|
|
||
| HashAndUpdate((DxilContainerHeader *)PTR); |
There was a problem hiding this comment.
Actually, IsDxilContainerLike should never fail here, and it returns the DxilContainerHeader * upon success. Plus, we need to make sure validation succeeded before hashing:
Suggested change
| LPVOID PTR = pResult->GetBufferPointer(); | |
| if (!IsDxilContainerLike(PTR, pResult->GetBufferSize())) | |
| return E_FAIL; | |
| HashAndUpdate((DxilContainerHeader *)PTR); | |
| if (SUCCEEDED(valHR)) | |
| HashAndUpdate(IsDxilContainerLike(pResult->GetBufferPointer(), | |
| pResult->GetBufferSize())); |
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.
Some error handling changes were incorrectly made to the container assembler, as described in the issue below.
This is bad because the API protocol for error handling must remain consistent across all functions. This PR
aims to restore the correct semantic meaning of returning bad HR values.
Fixes #7051