[SHELL32]

Fix a memory leak

CID 1322131

svn path=/trunk/; revision=69673
This commit is contained in:
Pierre Schweitzer 2015-10-24 10:24:37 +00:00
parent d3a401609e
commit 7479bc63fe

View file

@ -1321,6 +1321,7 @@ HRESULT CMenuSFToolbar::FillToolbar(BOOL clearFirst)
// If no items were added, show the "empty" placeholder
if (DPA_GetPtrCount(dpaSort) == 0)
{
DPA_Destroy(dpaSort);
return AddPlaceholder();
}
@ -1341,7 +1342,10 @@ HRESULT CMenuSFToolbar::FillToolbar(BOOL clearFirst)
hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr);
if (FAILED_UNEXPECTEDLY(hr))
{
DPA_Destroy(dpaSort);
return hr;
}
StrRetToStr(&sr, NULL, &MenuString);