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

Fix memory leaks in wxHtmlParser unit test

Browse Source 
Remove the unnecessary, and actually harmful, overridden GetProduct(),
as we must delete the pointer returned by the base class version to
avoid leaking it.

Also use wxScopedPtr to avoid leaking a test wxHtmlContainerCell.
This commit is contained in:
Ilya Sinitsyn 2020-10-13 14:00:56 +07:00 committed by Vadim Zeitlin
parent 413c05ea85
commit 02f697d0c0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/html/htmlparser.cpp
View File

@ -20,15 +20,13 @@
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/html/winpars.h" #include "wx/html/winpars.h"
#include "wx/scopedptr.h"
// Test that parsing invalid HTML simply fails but doesn't crash for example. // Test that parsing invalid HTML simply fails but doesn't crash for example.
TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]") TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]")
{ {
class NullParser : public wxHtmlWinParser class NullParser : public wxHtmlWinParser
{ {
public:
virtual wxObject *GetProduct() wxOVERRIDE { return NULL; }
protected: protected:
virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE { } virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE { }
}; };
@ -37,17 +35,17 @@ TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]")
wxMemoryDC dc; wxMemoryDC dc;
p.SetDC(&dc); p.SetDC(&dc);
p.Parse("<"); delete p.Parse("<");
p.Parse("<foo"); delete p.Parse("<foo");
p.Parse("<!--"); delete p.Parse("<!--");
p.Parse("<!---"); delete p.Parse("<!---");
} }
TEST_CASE("wxHtmlCell::Detach", "[html][cell]") TEST_CASE("wxHtmlCell::Detach", "[html][cell]")
{ {
wxMemoryDC dc; wxMemoryDC dc;
wxHtmlContainerCell* const top = new wxHtmlContainerCell(NULL); wxScopedPtr<wxHtmlContainerCell> const top(new wxHtmlContainerCell(NULL));
wxHtmlContainerCell* const cont = new wxHtmlContainerCell(NULL); wxHtmlContainerCell* const cont = new wxHtmlContainerCell(NULL);
wxHtmlCell* const cell1 = new wxHtmlWordCell("Hello", dc); wxHtmlCell* const cell1 = new wxHtmlWordCell("Hello", dc);
wxHtmlCell* const cell2 = new wxHtmlColourCell(*wxRED); wxHtmlCell* const cell2 = new wxHtmlColourCell(*wxRED);