mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor XmppParser::end_element to make it clearer

Browse Source 
Both for me, and apparently for clang static analyzer, who reported a (imo)
false positive.
This commit is contained in:
Florent Le Coz
2015-10-28 02:32:19 +01:00
parent 450de4c336
commit 4e32fe213c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
louloulibs/xmpp/xmpp_parser.cpp
+11 -7
View File
@@ -104,20 +104,24 @@ void XmppParser::start_element(const XML_Char* name, const XML_Char** attribute)
void XmppParser::end_element(const XML_Char*) void XmppParser::end_element(const XML_Char*)
{ {
this->level--; this->level--;
if (this->level == 1)
{
this->stanza_event(*this->current_node);
}
if (this->level == 0) if (this->level == 0)
{ { // End of the whole stream
this->stream_close_event(*this->current_node); this->stream_close_event(*this->current_node);
this->current_node = nullptr; this->current_node = nullptr;
this->root.reset(); this->root.reset();
} }
else else
this->current_node = this->current_node->get_parent(); {
auto parent = this->current_node->get_parent();
if (this->level == 1) if (this->level == 1)
this->current_node->delete_all_children(); { // End of a stanza
this->stanza_event(*this->current_node);
// Note: deleting all the children of our parent deletes ourself,
// so current_node is an invalid pointer after this line
this->current_node->get_parent()->delete_all_children();
}
this->current_node = parent;
}
} }
void XmppParser::char_data(const XML_Char* data, int len) void XmppParser::char_data(const XML_Char* data, int len)