diff options
| author | Rubin Xu <rubinxu@google.com> | 2019-11-07 18:03:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-07 18:03:58 +0000 |
| commit | 2a3fa9b789a1aaae63b758141787b31b7fa72995 (patch) | |
| tree | ed15f87c2edd27f0ae62a4e3d5e4aff26b298401 | |
| parent | a7abd37059ba0b3733a1aa9d0a8b42965baa24db (diff) | |
| parent | de53c4ea1b99f7823574ae7d5e5b483701b12394 (diff) | |
| download | v8-2a3fa9b789a1aaae63b758141787b31b7fa72995.tar.gz | |
Merge "[DO NOT MERGE] Fix OOB read in v8's Promise handling" into oc-mr1-dev
| -rw-r--r-- | src/builtins/builtins-promise.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/builtins/builtins-promise.cc b/src/builtins/builtins-promise.cc index 0d0238d2..1fb12902 100644 --- a/src/builtins/builtins-promise.cc +++ b/src/builtins/builtins-promise.cc @@ -98,6 +98,10 @@ Node* PromiseBuiltinsAssembler::NewPromiseCapability(Node* context, debug_event = TrueConstant(); } + Label if_not_constructor(this, Label::kDeferred); + GotoIf(TaggedIsSmi(constructor), &if_not_constructor); + GotoIfNot(IsConstructorMap(LoadMap(constructor)), &if_not_constructor); + Node* native_context = LoadNativeContext(context); Node* map = LoadRoot(Heap::kJSPromiseCapabilityMapRootIndex); @@ -182,6 +186,13 @@ Node* PromiseBuiltinsAssembler::NewPromiseCapability(Node* context, Unreachable(); } + Bind(&if_not_constructor); + { + Node* const message_id = SmiConstant(MessageTemplate::kNotConstructor); + CallRuntime(Runtime::kThrowTypeError, context, message_id, constructor); + Unreachable(); + } + Bind(&out); return var_result.value(); } @@ -310,6 +321,7 @@ Node* PromiseBuiltinsAssembler::SpeciesConstructor(Node* context, Node* object, // 7. If IsConstructor(S) is true, return S. Label throw_error(this); + GotoIf(TaggedIsSmi(species), &throw_error); Node* species_bitfield = LoadMapBitField(LoadMap(species)); GotoIfNot(Word32Equal(Word32And(species_bitfield, Int32Constant((1 << Map::kIsConstructor))), |