Add nullptr checks before accessing children in getUnspecialized #66644
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
|
@swift-ci smoke test |
adrian-prantl
approved these changes
Jun 14, 2023
al45tair
reviewed
Jun 15, 2023
There was a problem hiding this comment.
It would be better to use DEMANGLER_ASSERT() here, I think, since these nodes are supposed to have children and not having means there's a bug somewhere else in the demangling code.
DEMANGLER_ASSERT() returns a ManglingError in the runtime and in non-asserts builds, but in asserts builds it'll raise an assertion failure, which arguably we'd like to do in this case I think.
e.g. instead of
if (!node->hasChildren())
return MANGLING_ERROR(ManglingError::BadNominalTypeKind, node);
we could do
DEMANGLER_ASSERT(node->hasChildren(), node);
The demangler already has an error mechanism to report if demangling failed. Add null pointer checks before every access in Demangle::getUnspecialized, and return an error if the child doesn't exist. rdar://110141007
augusto2112
force-pushed
the
null-ptr-children-main
branch
from
8aaf3c8 to
4e2213d
Compare
|
@swift-ci smoke test |
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.
The demangler already has an error mechanism to report if demangling failed. Add null pointer checks before every access in Demangle::getUnspecialized, and return an error if the child doesn't exist.
rdar://110141007