wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 23:08:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1317376 - Part 2: Detect Promise self-resolution when resolving through the Promise resolving fast path.

Browse source 
Tag #1287
This commit is contained in:
Gaming4JC 2019-12-13 19:57:31 -05:00 • committed by Roy Tam
commit 70cbae88ea
2 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/src/builtin/Promise.cpp
View file

@ -346,16 +346,28 @@ static MOZ_MUST_USE bool EnqueuePromiseResolveThenableJob(JSContext* cx,
HandleValue thenable,
HandleValue thenVal);
// ES2016, 25.4.1.3.2, steps 7-13.
// ES2016, 25.4.1.3.2, steps 6-13.
static MOZ_MUST_USE bool
ResolvePromiseInternal(JSContext* cx, HandleObject promise, HandleValue resolutionVal)
{
// Step 7.
// Step 7 (reordered).
if (!resolutionVal.isObject())
return FulfillMaybeWrappedPromise(cx, promise, resolutionVal);
RootedObject resolution(cx, &resolutionVal.toObject());
// Step 6.
if (resolution == promise) {
// Step 6.a.
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
JSMSG_CANNOT_RESOLVE_PROMISE_WITH_ITSELF);
RootedValue selfResolutionError(cx);
MOZ_ALWAYS_TRUE(GetAndClearException(cx, &selfResolutionError));
// Step 6.b.
return RejectMaybeWrappedPromise(cx, promise, selfResolutionError);
}
// Step 8.
RootedValue thenVal(cx);
bool status = GetProperty(cx, resolution, resolution, cx->names().then, &thenVal);
@ -421,22 +433,6 @@ ResolvePromiseFunction(JSContext* cx, unsigned argc, Value* vp)
// functions. Actually marking it as fulfilled/rejected happens later.
ClearResolutionFunctionSlots(resolve);
// Step 6.
if (resolutionVal == promiseVal) {
// Step 6.a.
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
JSMSG_CANNOT_RESOLVE_PROMISE_WITH_ITSELF);
RootedValue selfResolutionError(cx);
bool status = GetAndClearException(cx, &selfResolutionError);
MOZ_ASSERT(status);
// Step 6.b.
status = RejectMaybeWrappedPromise(cx, promise, selfResolutionError);
if (status)
args.rval().setUndefined();
return status;
}
bool status = ResolvePromiseInternal(cx, promise, resolutionVal);
if (status)
args.rval().setUndefined();