FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make sure file is closed when an exception passes through

Browse Source
This commit is contained in:
curt
2001-07-24 21:41:19 +00:00
parent 5e929d7d01
commit c3a0db1aba
1 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/xml/easyxml.cxx
+24 -37
View File
@@ -12,32 +12,6 @@
SG_USING_STD(ifstream); SG_USING_STD(ifstream);
////////////////////////////////////////////////////////////////////////
// Implementation of sg_xml_exception.
////////////////////////////////////////////////////////////////////////
sg_xml_exception::sg_xml_exception ()
: sg_io_exception("", "SimGear XML parser")
{
}
sg_xml_exception::sg_xml_exception (const string &message)
: sg_io_exception(message, "SimGear XML parser")
{
}
sg_xml_exception::sg_xml_exception (const string &message,
const sg_location &location)
: sg_io_exception(message, location, "SimGear XML parser")
{
}
sg_xml_exception::~sg_xml_exception ()
{
}
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Implementation of XMLAttributes. // Implementation of XMLAttributes.
@@ -249,16 +223,18 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
throw sg_io_exception("Problem reading file", throw sg_io_exception("Problem reading file",
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser))); XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser");
} }
input.read(buf,16384); input.read(buf,16384);
if (!XML_Parse(parser, buf, input.gcount(), false)) { if (!XML_Parse(parser, buf, input.gcount(), false)) {
XML_ParserFree(parser); XML_ParserFree(parser);
throw sg_xml_exception(XML_ErrorString(XML_GetErrorCode(parser)), throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser))); XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser");
} }
} }
@@ -266,10 +242,11 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
// Verify end of document. // Verify end of document.
if (!XML_Parse(parser, buf, 0, true)) { if (!XML_Parse(parser, buf, 0, true)) {
XML_ParserFree(parser); XML_ParserFree(parser);
throw sg_xml_exception(XML_ErrorString(XML_GetErrorCode(parser)), throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser))); XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser");
} }
XML_ParserFree(parser); XML_ParserFree(parser);
@@ -280,10 +257,20 @@ readXML (const string &path, XMLVisitor &visitor)
{ {
ifstream input(path.c_str()); ifstream input(path.c_str());
if (input.good()) { if (input.good()) {
readXML(input, visitor, path); try {
readXML(input, visitor, path);
} catch (sg_io_exception &e) {
input.close();
throw e;
} catch (sg_throwable &t) {
input.close();
throw t;
}
} else { } else {
throw sg_io_exception("Failed to open file", sg_location(path)); throw sg_io_exception("Failed to open file", sg_location(path),
"SimGear XML Parser");
} }
input.close();
} }
// end of easyxml.cxx // end of easyxml.cxx