Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2024-11-29 21:00:51 +08:00
commit c6517989ab
5 changed files with 2182 additions and 1362 deletions

View file

@ -485,6 +485,11 @@ Performance::Measure(JSContext* aCx,
const Optional<nsAString>& aEndMark,
ErrorResult& aRv)
{
if (!GetParentObject()) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return nullptr;
}
// Maybe is more readable than using the union type directly.
Maybe<const PerformanceMeasureOptions&> options;
if (aStartOrMeasureOptions.IsPerformanceMeasureOptions()) {

View file

@ -7138,7 +7138,7 @@ JS_PUBLIC_API(bool)
js::gc::detail::CellIsMarkedGrayIfKnown(const Cell* cell)
{
MOZ_ASSERT(cell);
if (!cell->isTenured())
if (!cell || !cell->isTenured())
return false;
// We ignore the gray marking state of cells and return false in two cases:

File diff suppressed because it is too large Load diff

View file

@ -542,6 +542,7 @@ sec_pkcs7_decoder_start_decrypt(SEC_PKCS7DecoderContext *p7dcx, int depth,
* We are done with (this) bulkkey now.
*/
PK11_FreeSymKey(bulkkey);
bulkkey = NULL;
if (decryptobj == NULL) {
p7dcx->error = PORT_GetError();

View file

@ -3042,6 +3042,7 @@ nsLocalFile::IsExecutable(bool* aResult)
"jar", // java application bundle
"js",
"jse",
"library-ms", // Windows library files shell extension
"lnk",
"mad", // Access Module Shortcut
"maf", // Access