External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly call xml_buffered_writer::flush()

Browse Source 
If xml_writer::write throws an exception while being called from flush(), the
exception is thrown from destructor. Clang in C++11 mode calls std::terminate
in this case.
This commit is contained in:
Arseny Kapoulkine 2015-04-14 19:11:26 -07:00
parent e977f04fe2
commit 2badcbb674
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pugixml.cpp
View File

@ -3115,11 +3115,6 @@ PUGI__NS_BEGIN
PUGI__STATIC_ASSERT(bufcapacity >= 8); PUGI__STATIC_ASSERT(bufcapacity >= 8);
} }
~xml_buffered_writer()
{
flush();
}
size_t flush() size_t flush()
{ {
flush(buffer, bufsize); flush(buffer, bufsize);
@ -5496,6 +5491,8 @@ namespace pugi
impl::xml_buffered_writer buffered_writer(writer, encoding); impl::xml_buffered_writer buffered_writer(writer, encoding);
impl::node_output(buffered_writer, _root, indent, flags, depth); impl::node_output(buffered_writer, _root, indent, flags, depth);
buffered_writer.flush();
} }
#ifndef PUGIXML_NO_STL #ifndef PUGIXML_NO_STL
@ -6205,6 +6202,8 @@ namespace pugi
} }
impl::node_output(buffered_writer, _root, indent, flags, 0); impl::node_output(buffered_writer, _root, indent, flags, 0);
buffered_writer.flush();
} }
#ifndef PUGIXML_NO_STL #ifndef PUGIXML_NO_STL