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

Fixed incorrect allocator pointer in pages during parsing

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@415 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-05-11 06:55:07 +00:00
parent 157f720e12
commit 544a527abd
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pugixml.cpp
View File

@ -237,8 +237,6 @@ namespace pugi
namespace pugi namespace pugi
{ {
struct xml_document_struct;
static const uintptr_t xml_memory_page_alignment = 32; static const uintptr_t xml_memory_page_alignment = 32;
static const uintptr_t xml_memory_page_pointer_mask = ~(xml_memory_page_alignment - 1); static const uintptr_t xml_memory_page_pointer_mask = ~(xml_memory_page_alignment - 1);
static const uintptr_t xml_memory_page_name_allocated_mask = 16; static const uintptr_t xml_memory_page_name_allocated_mask = 16;
@ -257,11 +255,6 @@ namespace pugi
{ {
} }
~xml_allocator()
{
if (_root) _root->busy_size = _busy_size;
}
xml_memory_page* allocate_page(size_t data_size) xml_memory_page* allocate_page(size_t data_size)
{ {
#ifdef __GNUC__ #ifdef __GNUC__
@ -282,7 +275,7 @@ namespace pugi
xml_memory_page* page = new (page_memory) xml_memory_page(); xml_memory_page* page = new (page_memory) xml_memory_page();
page->memory = memory; page->memory = memory;
page->allocator = this; page->allocator = _root->allocator;
return page; return page;
} }