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

Fixed longjmp clobber warning in xml_parser::parse

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@706 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 19:29:35 +00:00
parent 529762d46b
commit 9266af0664
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pugixml.cpp
View File

@ -2293,18 +2293,18 @@ namespace
if (cursor != xmldoc) THROW_ERROR(status_end_element_mismatch, s); if (cursor != xmldoc) THROW_ERROR(status_end_element_mismatch, s);
} }
static xml_parse_result parse(char_t* buffer, size_t length, xml_node_struct* xmldoc, unsigned int optmsk) static xml_parse_result parse(char_t* buffer, size_t length, xml_node_struct* root, unsigned int optmsk)
{ {
xml_document_struct* xmldoc = static_cast<xml_document_struct*>(root);
// store buffer for offset_debug // store buffer for offset_debug
static_cast<xml_document_struct*>(xmldoc)->buffer = buffer; xmldoc->buffer = buffer;
// early-out for empty documents // early-out for empty documents
if (length == 0) return make_parse_result(status_ok); if (length == 0) return make_parse_result(status_ok);
// create parser on stack // create parser on stack
xml_allocator& alloc = *static_cast<xml_document_struct*>(xmldoc); xml_parser parser(*xmldoc);
xml_parser parser(alloc);
// save last character and make buffer zero-terminated (speeds up parsing) // save last character and make buffer zero-terminated (speeds up parsing)
char_t endch = buffer[length - 1]; char_t endch = buffer[length - 1];
@ -2321,7 +2321,7 @@ namespace
xml_parse_result result = make_parse_result(static_cast<xml_parse_status>(error), parser.error_offset ? parser.error_offset - buffer : 0); xml_parse_result result = make_parse_result(static_cast<xml_parse_status>(error), parser.error_offset ? parser.error_offset - buffer : 0);
// update allocator state // update allocator state
alloc = parser.alloc; *static_cast<xml_allocator*>(xmldoc) = parser.alloc;
// since we removed last character, we have to handle the only possible false positive // since we removed last character, we have to handle the only possible false positive
if (result && endch == '<') if (result && endch == '<')