AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from Dmitry-Me/unlinkedElementsAssertions 

Unlinked nodes assertions
This commit is contained in:
Lee Thomason 2017-06-15 10:29:07 -07:00 committed by GitHub
parent e84f68a68a c2f677b05e
commit 275067a91f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tinyxml2.cpp
View File

@ -1994,6 +1994,7 @@ XMLDocument::~XMLDocument()
void XMLDocument::MarkInUse(XMLNode* node) void XMLDocument::MarkInUse(XMLNode* node)
{ {
TIXMLASSERT(node);
TIXMLASSERT(node->_parent == 0); TIXMLASSERT(node->_parent == 0);
for (int i = 0; i < _unlinked.Size(); ++i) { for (int i = 0; i < _unlinked.Size(); ++i) {

4
tinyxml2.h
View File

@ -265,8 +265,8 @@ public:
} }
void SwapRemove(int i) { void SwapRemove(int i) {
TIXMLASSERT(i >= 0); TIXMLASSERT(i >= 0 && i < _size);
TIXMLASSERT(i < _size); TIXMLASSERT(_size > 0);
_mem[i] = _mem[_size - 1]; _mem[i] = _mem[_size - 1];
--_size; --_size;
} }