tomasz.sowa
/
pikotools
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

fix: memory leak in the HTMLParser when a compact mode was used

This commit is contained in:
Tomasz Sowa 2023-10-18 18:33:52 +02:00
parent 57f49cdcb6
commit 21614a5309
Signed by: tomasz.sowa
GPG Key ID: 662CC1438638588B
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/html/htmlparser.cpp
View File

@ -1603,7 +1603,7 @@ void HTMLParser::ReadText(bool is_cdata)
if( text_space_wstr && !text_space_wstr->empty() && was_non_white_text ) if( text_space_wstr && !text_space_wstr->empty() && was_non_white_text )
{ {
AddSpaceToSpaceTree(*text_space); AddTextSpaceToSpaceTree(*text_space);
} }
text_space_tmp.clear(); text_space_tmp.clear();
@ -2195,26 +2195,34 @@ void HTMLParser::AddItemToSpace()
if( xml_compact_mode ) if( xml_compact_mode )
{ {
Space * space = parent->get_space(pstack[stack_len-1].name); bool has_parent_object_name = false;
if( space ) if( parent->is_object() )
{ {
if( space->is_table() ) Space::ObjectType::iterator i = parent->value.value_object.find(pstack[stack_len-1].name);
{
Space & child = space->add_empty_space();
pstack[stack_len-1].space = &child;
}
else
{
Space * tab = new Space();
tab->add(space);
Space & child = tab->add_empty_space();
parent->value.value_object[pstack[stack_len-1].name] = tab; if( i != parent->value.value_object.end() )
pstack[stack_len-1].space = &child; {
has_parent_object_name = true;
if( i->second->is_table() )
{
Space & child = i->second->add_empty_space();
pstack[stack_len-1].space = &child;
}
else
{
Space * old_space = i->second;
i->second = new Space();
i->second->set_empty_table();
i->second->value.value_table.push_back(old_space);
Space & child = i->second->add_empty_space();
pstack[stack_len-1].space = &child;
}
} }
} }
else
if( !has_parent_object_name )
{ {
Space & space = parent->add_empty_space(pstack[stack_len-1].name); Space & space = parent->add_empty_space(pstack[stack_len-1].name);
pstack[stack_len-1].space = &space; pstack[stack_len-1].space = &space;
@ -2226,7 +2234,6 @@ void HTMLParser::AddItemToSpace()
Space & child = childs_tab.add_empty_space(); Space & child = childs_tab.add_empty_space();
pstack[stack_len-1].space = &child; pstack[stack_len-1].space = &child;
} }
} }
} }
@ -2261,7 +2268,7 @@ void HTMLParser::RemoveLastSpace(size_t index)
} }
} }
void HTMLParser::AddSpaceToSpaceTree(const Space & space) void HTMLParser::AddTextSpaceToSpaceTree(const Space & space)
{ {
const std::wstring * text = space.get_wstr(L"text"); const std::wstring * text = space.get_wstr(L"text");
@ -2269,23 +2276,32 @@ void HTMLParser::AddSpaceToSpaceTree(const Space & space)
{ {
if( xml_compact_mode ) if( xml_compact_mode )
{ {
Space * child_text = LastItem().space->get_space(L"text"); bool has_space_text = false;
if( child_text ) if( LastItem().space->is_object() )
{ {
if( child_text->is_table() ) Space::ObjectType::iterator i = LastItem().space->value.value_object.find(L"text");
if( i != LastItem().space->value.value_object.end() )
{ {
child_text->add(*text); has_space_text = true;
}
else if( i->second->is_table() )
{ {
Space * tab = new Space(); i->second->add(*text);
tab->add(*child_text); }
tab->add(*text); else
LastItem().space->value.value_object[L"text"] = tab; {
Space * old_space = i->second;
i->second = new Space();
i->second->set_empty_table();
i->second->value.value_table.push_back(old_space);
i->second->add(*text);
}
} }
} }
else
if( !has_space_text )
{ {
LastItem().space->add(L"text", *text); LastItem().space->add(L"text", *text);
} }

2
src/html/htmlparser.h
View File

@ -443,7 +443,7 @@ protected:
void AddItemToSpace(); void AddItemToSpace();
void RemoveLastSpace(size_t index); void RemoveLastSpace(size_t index);
void AddSpaceToSpaceTree(const Space & space); void AddTextSpaceToSpaceTree(const Space & space);
bool RemoveIfNeeded(size_t index); bool RemoveIfNeeded(size_t index);