Changeset 719

Timestamp:

12/5/2008 11:53:24 PM (5 years ago)

Author:

lowjoel

Message:

Fixed a memory leak when using GetSeparator?

File:

• branches/eraser6/ShellExt/CtxMenu.cpp (modified) (4 diffs)

branches/eraser6/ShellExt/CtxMenu.cpp

@@ -185 +185 @@
         if (applicableActions & ACTION_ERASE_ON_RESTART)
         {
-            InsertMenu    (hSubmenu, ACTION_ERASE_ON_RESTART, MF_BYPOSITION, uID++, _T("Erase on &Restart"));
+            InsertMenu    (hSubmenu, ACTION_ERASE_ON_RESTART, MF_BYPOSITION, uID++,     _T("Erase on &Restart"));
             VerbMenuIndices.push_back(ACTION_ERASE_ON_RESTART);
         }
@@ -197 +197 @@
         {
             if (uID - uidFirstCmd > 0)
-                InsertMenuItem(hSubmenu, 0, FALSE, GetSeparator());
+            {
+                std::auto_ptr<MENUITEMINFO> separator(GetSeparator());
+                InsertMenuItem(hSubmenu, 0, FALSE, separator);
+            }
+
             InsertMenu    (hSubmenu, ACTION_SECURE_MOVE, MF_BYPOSITION, uID++,          _T("Secure &Move"));
             VerbMenuIndices.push_back(ACTION_SECURE_MOVE);
@@ -478 +482 @@
                 std::wstringstream strm;
                 strm << L"An invalid command with the ID "
-                    << VerbMenuIndices[LOWORD(pCmdInfo->lpVerb)] << L"was requested.\n\n"
+                    << VerbMenuIndices[LOWORD(pCmdInfo->lpVerb)] << L" was requested.\n\n"
                     << L"Eraser was unable to process the request.";
                 MessageBox(pCmdInfo->hwnd, strm.str().c_str(), L"Eraser Shell Extension", MB_OK | MB_ICONERROR);
@@ -604 +608 @@
     MENUITEMINFO* CCtxMenu::GetSeparator()
     {
-        MENUITEMINFO *mii = new MENUITEMINFO();
+        MENUITEMINFO* mii = new MENUITEMINFO();
         mii->cbSize = sizeof(MENUITEMINFO);
         mii->fMask = MIIM_TYPE;