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

icecat: add release icecat-140.8.0-2 for aramo

Browse source
This commit is contained in:
Ark74 2026-03-11 06:58:43 -06:00
parent d9a6c0aa96
commit d570f39e11
616 changed files with 39955 additions and 33937 deletions
Download patch file Download diff file Expand all files Collapse all files

13
icecat/parser/expat/expat/lib/moz_expat.h
View file

@ -59,7 +59,7 @@ MOZ_XML_SetExternalEntityRefHandler(XML_Parser parser,
void
MOZ_XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
enum XML_Status
void
MOZ_XML_SetBase(XML_Parser parser, const XML_Char *base);
const XML_Char *
@ -68,13 +68,15 @@ MOZ_XML_GetBase(XML_Parser parser);
int
MOZ_XML_GetSpecifiedAttributeCount(XML_Parser parser);
enum XML_Status
// The return value is an XML_Status.
int
MOZ_XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
enum XML_Status
void
MOZ_XML_StopParser(XML_Parser parser, int resumable);
enum XML_Status
// The return value is an XML_Status.
int
MOZ_XML_ResumeParser(XML_Parser parser);
XML_Parser
@ -89,7 +91,8 @@ MOZ_XML_SetParamEntityParsing(XML_Parser parser,
int
MOZ_XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt);
enum XML_Error
// The return value is an XML_Error.
int
MOZ_XML_GetErrorCode(XML_Parser parser);
XML_Size MOZ_XML_GetCurrentLineNumber(XML_Parser parser);

14
icecat/parser/expat/expat/lib/moz_xmlparse.c
View file

@ -75,9 +75,9 @@ MOZ_XML_SetReturnNSTriplet(XML_Parser parser, int do_nst) {
XML_SetReturnNSTriplet(parser, do_nst);
}
enum XML_Status
void
MOZ_XML_SetBase(XML_Parser parser, const XML_Char *base) {
return XML_SetBase(parser, base);
XML_SetBase(parser, base);
}
const XML_Char *
@ -90,17 +90,17 @@ MOZ_XML_GetSpecifiedAttributeCount(XML_Parser parser) {
return XML_GetSpecifiedAttributeCount(parser);
}
enum XML_Status
int
MOZ_XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
return XML_Parse(parser, s, len, isFinal);
}
enum XML_Status
void
MOZ_XML_StopParser(XML_Parser parser, int resumable) {
return XML_StopParser(parser, resumable);
XML_StopParser(parser, resumable);
}
enum XML_Status
int
MOZ_XML_ResumeParser(XML_Parser parser) {
return XML_ResumeParser(parser);
}
@ -123,7 +123,7 @@ MOZ_XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt) {
return XML_SetHashSalt(parser, hash_salt);
}
enum XML_Error
int
MOZ_XML_GetErrorCode(XML_Parser parser)
{
return XML_GetErrorCode(parser);

23
icecat/parser/html/nsHtml5TreeOperation.cpp
View file

@ -258,6 +258,7 @@ nsresult nsHtml5TreeOperation::Append(nsIContent* aNode, nsIContent* aParent,
nsHtml5DocumentBuilder* aBuilder) {
MOZ_ASSERT(aBuilder);
MOZ_ASSERT(aBuilder->IsInDocUpdate());
MOZ_ASSERT(!aNode->GetParentNode());
ErrorResult rv;
Document* ownerDoc = aParent->OwnerDoc();
nsHtml5OtherDocUpdate update(ownerDoc, aBuilder->GetDocument());
@ -272,6 +273,13 @@ nsresult nsHtml5TreeOperation::Append(nsIContent* aNode, nsIContent* aParent,
nsresult nsHtml5TreeOperation::Append(nsIContent* aNode, nsIContent* aParent,
FromParser aFromParser,
nsHtml5DocumentBuilder* aBuilder) {
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
Detach(aNode, aBuilder);
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
// Can this happen? If it can, give up.
return NS_OK;
}
}
Maybe<nsHtml5AutoPauseUpdate> autoPause;
Maybe<AutoCEReaction> autoCEReaction;
DocGroup* docGroup = aParent->OwnerDoc()->GetDocGroup();
@ -294,6 +302,13 @@ nsresult nsHtml5TreeOperation::AppendToDocument(
MOZ_ASSERT(aBuilder);
MOZ_ASSERT(aBuilder->GetDocument() == aNode->OwnerDoc());
MOZ_ASSERT(aBuilder->IsInDocUpdate());
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
Detach(aNode, aBuilder);
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
// Can this happen? If it can, give up.
return NS_OK;
}
}
ErrorResult rv;
Document* doc = aBuilder->GetDocument();
@ -377,6 +392,14 @@ nsresult nsHtml5TreeOperation::FosterParent(nsIContent* aNode,
nsHtml5DocumentBuilder* aBuilder) {
MOZ_ASSERT(aBuilder);
MOZ_ASSERT(aBuilder->IsInDocUpdate());
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
Detach(aNode, aBuilder);
if (MOZ_UNLIKELY(aNode->GetParentNode())) {
// Can this happen? If it can, give up.
return NS_OK;
}
}
nsIContent* foster = aTable->GetParent();
if (IsElementOrTemplateContent(foster)) {

22
icecat/parser/htmlparser/nsExpatDriver.cpp
View file

@ -102,19 +102,23 @@ static T safe_unverified(T val) {
return val;
}
template <typename E, E MinLegal, E MaxLegal>
inline E enum_verifier(std::underlying_type_t<E> e) {
using U = std::underlying_type_t<E>;
MOZ_RELEASE_ASSERT(
e >= static_cast<U>(MinLegal) && e <= static_cast<U>(MaxLegal),
"unexpected enum value");
return static_cast<E>(e);
};
/* status_verifier is a type validator for XML_Status */
inline enum XML_Status status_verifier(enum XML_Status s) {
MOZ_RELEASE_ASSERT(s >= XML_STATUS_ERROR && s <= XML_STATUS_SUSPENDED,
"unexpected status code");
return s;
inline XML_Status status_verifier(std::underlying_type_t<XML_Status> s) {
return enum_verifier<XML_Status, XML_STATUS_ERROR, XML_STATUS_SUSPENDED>(s);
}
/* error_verifier is a type validator for XML_Error */
inline enum XML_Error error_verifier(enum XML_Error code) {
MOZ_RELEASE_ASSERT(
code >= XML_ERROR_NONE && code <= XML_ERROR_INVALID_ARGUMENT,
"unexpected XML error code");
return code;
inline XML_Error error_verifier(std::underlying_type_t<XML_Error> code) {
return enum_verifier<XML_Error, XML_ERROR_NONE, XML_ERROR_NOT_STARTED>(code);
}
/* We use unverified_xml_string to just expose sandbox expat strings to IceCat