-
-
Notifications
You must be signed in to change notification settings - Fork 8.9k
fix(runtime-core): guard prop validator against invalid types to avoid instanceof crash (fix #14041) #14042
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
+26
−18
Open
fix(runtime-core): guard prop validator against invalid types to avoid instanceof crash (fix #14041) #14042
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -626,12 +626,7 @@ function validatePropName(key: string) { | |
| // dev only | ||
| // use function string name to check type constructors | ||
| // so that it works across vms / iframes. | ||
| function getType(ctor: Prop<any> | null): string { | ||
| // Early return for null to avoid unnecessary computations | ||
| if (ctor === null) { | ||
| return 'null' | ||
| } | ||
|
|
||
| function getType(ctor: Prop<any>): string { | ||
| // Avoid using regex for common cases by checking the type directly | ||
| if (typeof ctor === 'function') { | ||
| // Using name property to avoid converting function to string | ||
|
|
@@ -697,9 +692,22 @@ function validateProp( | |
| const expectedTypes = [] | ||
| // value is valid as long as one of the specified types match | ||
| for (let i = 0; i < types.length && !isValid; i++) { | ||
| const { valid, expectedType } = assertType(value, types[i]) | ||
| expectedTypes.push(expectedType || '') | ||
| isValid = valid | ||
| // Handle null type directly without calling assertType | ||
| if (types[i] === null) { | ||
| if (value === null) { | ||
| expectedTypes.push('null') | ||
| isValid = true | ||
| } else { | ||
| expectedTypes.push('null') | ||
| } | ||
| } else if (types[i] !== undefined) { | ||
| // TypeScript doesn't narrow the type after the checks above, | ||
| // so we use a const to help it understand types[i] is not null/undefined here | ||
| const type = types[i] as PropConstructor | ||
| const { valid, expectedType } = assertType(value, type) | ||
| expectedTypes.push(expectedType || '') | ||
| isValid = valid | ||
| } | ||
| } | ||
| if (!isValid) { | ||
| warn(getInvalidTypeMessage(name, value, expectedTypes)) | ||
|
|
@@ -724,27 +732,27 @@ type AssertionResult = { | |
| /** | ||
| * dev only | ||
| */ | ||
| function assertType( | ||
| value: unknown, | ||
| type: PropConstructor | null, | ||
| ): AssertionResult { | ||
| function assertType(value: unknown, type: PropConstructor): AssertionResult { | ||
| let valid | ||
| const expectedType = getType(type) | ||
| if (expectedType === 'null') { | ||
| valid = value === null | ||
| } else if (isSimpleType(expectedType)) { | ||
| if (isSimpleType(expectedType)) { | ||
| const t = typeof value | ||
| valid = t === expectedType.toLowerCase() | ||
| // for primitive wrapper objects | ||
| if (!valid && t === 'object') { | ||
| valid = value instanceof (type as PropConstructor) | ||
| // Guard against invalid prop type definitions (e.g. 'object', {}, etc.) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The proper fix should be to avoid calling There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Sorry, I misunderstood the meaning. I'll fix it right now |
||
| // Only attempt instanceof when the provided type is a function/constructor. | ||
| valid = isFunction(type) && value instanceof (type as PropConstructor) | ||
| } | ||
| } else if (expectedType === 'Object') { | ||
| valid = isObject(value) | ||
| } else if (expectedType === 'Array') { | ||
| valid = isArray(value) | ||
| } else { | ||
| valid = value instanceof (type as PropConstructor) | ||
| // Fallback to constructor check only when type is a function. | ||
| // This avoids errors like "Right-hand side of 'instanceof' is not an object" | ||
| // when users mistakenly pass invalid values (e.g. strings) in prop type. | ||
| valid = isFunction(type) && value instanceof (type as PropConstructor) | ||
| } | ||
| return { | ||
| valid, | ||
|
|
||
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.