[SHELL32]

- Avoid leaking the list items on destruction of CEnumIDListBase
CORE-13194

svn path=/trunk/; revision=74498

diff --git a/reactos/dll/win32/shell32/CEnumIDListBase.cpp b/reactos/dll/win32/shell32/CEnumIDListBase.cpp
index 50facd5..bbf5435 100644 (file)
--- a/reactos/dll/win32/shell32/CEnumIDListBase.cpp
+++ b/reactos/dll/win32/shell32/CEnumIDListBase.cpp
@@ -22,15 +22,16 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
-CEnumIDListBase::CEnumIDListBase()
+CEnumIDListBase::CEnumIDListBase() :
+    mpFirst(NULL),
+    mpLast(NULL),
+    mpCurrent(NULL)
 {
-    mpFirst = NULL;
-    mpLast = NULL;
-    mpCurrent = NULL;
 }
 
 CEnumIDListBase::~CEnumIDListBase()
 {
+    DeleteList();
 }
 
 /**************************************************************************

diff --git a/reactos/dll/win32/shell32/CEnumIDListBase.h b/reactos/dll/win32/shell32/CEnumIDListBase.h
index 8dc1b4d..5a8a366 100644 (file)
--- a/reactos/dll/win32/shell32/CEnumIDListBase.h
+++ b/reactos/dll/win32/shell32/CEnumIDListBase.h
@@ -33,7 +33,7 @@ private:
        ENUMLIST                                *mpCurrent;
 public:
        CEnumIDListBase();
-       ~CEnumIDListBase();
+       virtual ~CEnumIDListBase();
        BOOL AddToEnumList(LPITEMIDLIST pidl);
        BOOL DeleteList();
        BOOL HasItemWithCLSID(LPITEMIDLIST pidl);