pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #73486

Browse Source
This commit is contained in:
Green
2025-05-14 16:29:35 +03:00
parent ea15b54837
commit 906aace0df
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Common/3dParty/html/htmltoxhtml.h
View File

@ -443,6 +443,12 @@ static void substitute_xml_entities_into_attributes(std::string& text)
replace_all(text, "\"", """); replace_all(text, "\"", """);
} }
// Удаляем символы, которые ломают работу XmlUtils::CXmlLiteReader
static void remove_control_character(std::string& sText)
{
sText.erase(std::remove_if(sText.begin(), sText.end(), [](char chValue){ return chValue < 0x09; }));
}
static std::string handle_unknown_tag(GumboStringPiece* text) static std::string handle_unknown_tag(GumboStringPiece* text)
{ {
if (text->data == NULL) if (text->data == NULL)
@ -474,6 +480,7 @@ static void build_doctype(GumboNode* node, NSStringUtils::CStringBuilderA& oBuil
oBuilder.WriteString("<!DOCTYPE "); oBuilder.WriteString("<!DOCTYPE ");
oBuilder.WriteString(node->v.document.name); oBuilder.WriteString(node->v.document.name);
std::string pi(node->v.document.public_identifier); std::string pi(node->v.document.public_identifier);
remove_control_character(pi);
if ((node->v.document.public_identifier != NULL) && !pi.empty()) if ((node->v.document.public_identifier != NULL) && !pi.empty())
{ {
oBuilder.WriteString(" PUBLIC \""); oBuilder.WriteString(" PUBLIC \"");
@ -494,6 +501,10 @@ static void build_attributes(const GumboVector* attribs, bool no_entities, NSStr
GumboAttribute* at = static_cast<GumboAttribute*>(attribs->data[i]); GumboAttribute* at = static_cast<GumboAttribute*>(attribs->data[i]);
std::string sVal(at->value); std::string sVal(at->value);
std::string sName(at->name); std::string sName(at->name);
remove_control_character(sVal);
remove_control_character(sName);
atts.WriteString(" "); atts.WriteString(" ");
bool bCheck = false; bool bCheck = false;
@ -558,6 +569,7 @@ static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA
std::string val(child->v.text.text); std::string val(child->v.text.text);
if(!no_entity_substitution) if(!no_entity_substitution)
substitute_xml_entities_into_text(val); substitute_xml_entities_into_text(val);
remove_control_character(val);
// Избавление от FF // Избавление от FF
size_t found = val.find_first_of("\014"); size_t found = val.find_first_of("\014");
@ -596,6 +608,7 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
} }
std::string tagname = get_tag_name(node); std::string tagname = get_tag_name(node);
remove_control_character(tagname);
if (NodeIsUnprocessed(tagname)) if (NodeIsUnprocessed(tagname))
return; return;