CMXSL.org/trisquel-icecat
2
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

icecat: add release icecat-140.6.0-1gnu1 for aramo

Browse source
This commit is contained in:
Ark74 2026-01-17 18:56:47 -06:00
parent 92fef42cd6
commit 17ba0259bf
3382 changed files with 457689 additions and 569094 deletions
Download patch file Download diff file Expand all files Collapse all files

47
icecat/dom/base/nsObjectLoadingContent.cpp
View file

@ -701,7 +701,6 @@ nsObjectLoadingContent::UpdateObjectParameters() {
nsresult rv;
nsAutoCString newMime;
nsAutoString typeAttr;
nsCOMPtr<nsIURI> newURI;
nsCOMPtr<nsIURI> newBaseURI;
ObjectType newType;
@ -729,7 +728,6 @@ nsObjectLoadingContent::UpdateObjectParameters() {
el->HasNonEmptyAttr(nsGkAtoms::classid)) {
// We don't support class ID plugin references, so we should always treat
// having class Ids as attributes as invalid, and fallback accordingly.
newMime.Truncate();
stateInvalid = true;
}
@ -759,16 +757,6 @@ nsObjectLoadingContent::UpdateObjectParameters() {
newBaseURI = docBaseURI;
}
nsAutoString rawTypeAttr;
el->GetAttr(nsGkAtoms::type, rawTypeAttr);
if (!rawTypeAttr.IsEmpty()) {
typeAttr = rawTypeAttr;
nsAutoString params;
nsAutoString mime;
nsContentUtils::SplitMimeType(rawTypeAttr, mime, params);
CopyUTF16toUTF8(mime, newMime);
}
///
/// URI
///
@ -803,6 +791,41 @@ nsObjectLoadingContent::UpdateObjectParameters() {
}
}
///
/// type
///
nsAutoString rawTypeAttr;
el->GetAttr(nsGkAtoms::type, rawTypeAttr);
// YouTube embeds might be using type="application/x-shockwave-flash"
// which needs to be allowed, but must not override the text/html MIME set
// above.
if (!mRewrittenYoutubeEmbed && !rawTypeAttr.IsEmpty()) {
nsAutoString params;
nsAutoString mime;
nsContentUtils::SplitMimeType(rawTypeAttr, mime, params);
if (!StaticPrefs::dom_object_embed_type_hint_enabled()) {
NS_ConvertUTF16toUTF8 mimeUTF8(mime);
if (imgLoader::SupportImageWithMimeType(mimeUTF8)) {
// Normally the type attribute should not be used as a hint, but for
// images it does seem to happen in Chrome and Safari. Images generally
// don't lead to code execution and we don't use
// AcceptedMimeTypes::IMAGES_AND_DOCUMENTS above.
newMime = mimeUTF8;
} else if (GetTypeOfContent(mimeUTF8) != ObjectType::Document) {
LOG(
("OBJLC [%p]: MIME '%s' from type attribute is not supported, "
"forcing fallback.",
this, mimeUTF8.get()));
stateInvalid = true;
}
// Don't use the type attribute as a Content-Type hint in other cases.
} else {
CopyUTF16toUTF8(mime, newMime);
}
}
///
/// Check if the original (pre-channel) content-type or URI changed, and
/// record mOriginal{ContentType,URI}