fix #4872, use context agnostic Function constructor check #4928
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
yyx990803
requested changes
Feb 14, 2017
src/core/util/props.js
Outdated
| @@ -70,7 +70,8 @@ function getPropDefaultValue (vm: ?Component, prop: PropOptions, key: string): a | |||
| return vm[key] | |||
| } | |||
| // call factory function for non-Function types | |||
| return typeof def === 'function' && prop.type !== Function | |||
| // a value is Function if its prototype is function even across different execution context | |||
| return typeof def === 'function' && (!prop.type || typeof prop.type.prototype !== 'function') | |||
There was a problem hiding this comment.
Actually we already have the proper check implemented here: https://github.com/vuejs/vue/blob/dev/src/core/util/props.js#L166-L169
So we can just do getType(prop.type) === 'Function'
There was a problem hiding this comment.
Thanks! Didn't notice that!
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.
If the prototype of a function is also a function, we treat it as
Functionconstructor.This check is context independent, so server side can safely extract vue as an external library. And it is not expensive.
Of course it is not silver bullet. Users can pass a value of which the prototype is set to a function. But naughty users can also rewrite
Functionglobal, so I think this change is at most as bad as current check.Other counter examples are welcome!