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

ported from mozilla: Bug 1538622 - StructuredClone serialize and deserialize should treat back reference consistently r=jorendorff (aca6f427e0)

Browse source
This commit is contained in:
roytam1 2023-10-22 23:11:52 +08:00
commit e7c5600d7d
4 changed files with 64 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/src/vm/StructuredClone.cpp
View file

@ -2046,6 +2046,7 @@ bool
JSStructuredCloneReader::startRead(MutableHandleValue vp)
{
uint32_t tag, data;
bool alreadAppended = false;
if (!in.readPair(&tag, &data))
return false;
@ -2246,15 +2247,29 @@ JSStructuredCloneReader::startRead(MutableHandleValue vp)
"unsupported type");
return false;
}
// callbacks->read() might read other objects from the buffer.
// In startWrite we always write the object itself before calling
// the custom function. We should do the same here to keep
// indexing consistent.
uint32_t placeholderIndex = allObjs.length();
Value dummy = UndefinedValue();
if (!allObjs.append(dummy)) {
return false;
}
JSObject* obj = callbacks->read(context(), this, tag, data, closure);
if (!obj)
return false;
vp.setObject(*obj);
allObjs[placeholderIndex].set(vp);
alreadAppended = true;
}
}
if (vp.isObject() && !allObjs.append(vp))
if (!alreadAppended && vp.isObject() && !allObjs.append(vp)) {
return false;
}
return true;
}
@ -2828,7 +2843,20 @@ JS_WriteTypedArray(JSStructuredCloneWriter* w, HandleValue v)
MOZ_ASSERT(v.isObject());
assertSameCompartment(w->context(), v);
RootedObject obj(w->context(), &v.toObject());
return w->writeTypedArray(obj);
// startWrite can write everything, thus we should check here
// and report error if the user passes a wrong type.
if (!JS_IsTypedArrayObject(obj)) {
JS_ReportErrorNumberASCII(w->context(), GetErrorMessage, nullptr,
JSMSG_SC_BAD_SERIALIZED_DATA,
"expected type array");
return false;
}
// We should use startWrite instead of writeTypedArray, because
// typed array is an object, we should add it to the |memory|
// (allObjs) list. Directly calling writeTypedArray won't add it.
return w->startWrite(v);
}
JS_PUBLIC_API(bool)