Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leaks in wxXml unit test.

Browse Source 
Ensure that the root wxXmlNode is deleted by storing it in a wxScopedPtr
instead of a raw pointer.

See #11593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-03-30 14:16:13 +00:00
parent c180fd77f4
commit e8afaabf01
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/xml/xmltest.cpp
View File

@@ -22,6 +22,7 @@
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
#include "wx/scopedptr.h"
#include "wx/sstream.h" #include "wx/sstream.h"
#include <stdarg.h> #include <stdarg.h>
@@ -33,7 +34,7 @@
namespace namespace
{ {
void CheckXml(wxXmlNode *n, ...) void CheckXml(const wxScopedPtr<wxXmlNode>& n, ...)
{ {
va_list args; va_list args;
va_start(args, n); va_start(args, n);
@@ -49,7 +50,7 @@ void CheckXml(wxXmlNode *n, ...)
CPPUNIT_ASSERT( child ); CPPUNIT_ASSERT( child );
CPPUNIT_ASSERT_EQUAL( childName, child->GetName() ); CPPUNIT_ASSERT_EQUAL( childName, child->GetName() );
CPPUNIT_ASSERT( child->GetChildren() == NULL ); CPPUNIT_ASSERT( child->GetChildren() == NULL );
CPPUNIT_ASSERT( child->GetParent() == n ); CPPUNIT_ASSERT( child->GetParent() == n.get() );
child = child->GetNext(); child = child->GetNext();
} }
@@ -96,7 +97,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlTestCase, "XmlTestCase" );
void XmlTestCase::InsertChild() void XmlTestCase::InsertChild()
{ {
wxXmlNode *root = new wxXmlNode(wxXML_ELEMENT_NODE, "root"); wxScopedPtr<wxXmlNode> root(new wxXmlNode(wxXML_ELEMENT_NODE, "root"));
root->AddChild(new wxXmlNode(wxXML_ELEMENT_NODE, "1")); root->AddChild(new wxXmlNode(wxXML_ELEMENT_NODE, "1"));
wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2"); wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2");
root->AddChild(two); root->AddChild(two);
@@ -116,7 +117,7 @@ void XmlTestCase::InsertChild()
void XmlTestCase::InsertChildAfter() void XmlTestCase::InsertChildAfter()
{ {
wxXmlNode *root = new wxXmlNode(wxXML_ELEMENT_NODE, "root"); wxScopedPtr<wxXmlNode> root(new wxXmlNode(wxXML_ELEMENT_NODE, "root"));
root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "1"), NULL); root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "1"), NULL);
CheckXml(root, "1", NULL); CheckXml(root, "1", NULL);