Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ImageResizer]Fix call to AssocGetPerceivedType (#23267)

Browse Source
This commit is contained in:
Jaime Bernardo
2023-01-11 14:13:00 +00:00
committed by GitHub
parent 3a924ab333
commit eb2968de6e
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp
View File

@@ -106,8 +106,20 @@ public:
} }
LPTSTR pszPath; LPTSTR pszPath;
// Retrieves the entire file system path of the file from its shell item // Retrieves the entire file system path of the file from its shell item
shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath); HRESULT getDisplayResult = shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);
if (S_OK != getDisplayResult || nullptr == pszPath)
{
// Avoid crashes in the following code.
return E_FAIL;
}
LPTSTR pszExt = PathFindExtension(pszPath); LPTSTR pszExt = PathFindExtension(pszPath);
if (nullptr == pszExt)
{
CoTaskMemFree(pszPath);
// Avoid crashes in the following code.
return E_FAIL;
}
// TODO: Instead, detect whether there's a WIC codec installed that can handle this file // TODO: Instead, detect whether there's a WIC codec installed that can handle this file
AssocGetPerceivedType(pszExt, &type, &flag, NULL); AssocGetPerceivedType(pszExt, &type, &flag, NULL);

26
src/modules/imageresizer/dll/ContextMenuHandler.cpp
View File

@@ -82,7 +82,19 @@ HRESULT CContextMenuHandler::QueryContextMenu(_In_ HMENU hmenu, UINT indexMenu,
PERCEIVED type; PERCEIVED type;
PERCEIVEDFLAG flag; PERCEIVEDFLAG flag;
LPTSTR pszPath = i.CurrentItem(); LPTSTR pszPath = i.CurrentItem();
if (nullptr == pszPath)
{
// Avoid crashes in the following code.
return E_FAIL;
}
LPTSTR pszExt = PathFindExtension(pszPath); LPTSTR pszExt = PathFindExtension(pszPath);
if (nullptr == pszExt)
{
free(pszPath);
// Avoid crashes in the following code.
return E_FAIL;
}
// TODO: Instead, detect whether there's a WIC codec installed that can handle this file // TODO: Instead, detect whether there's a WIC codec installed that can handle this file
AssocGetPerceivedType(pszExt, &type, &flag, NULL); AssocGetPerceivedType(pszExt, &type, &flag, NULL);
@@ -378,8 +390,20 @@ HRESULT __stdcall CContextMenuHandler::GetState(IShellItemArray* psiItemArray, B
psiItemArray->GetItemAt(0, &shellItem); psiItemArray->GetItemAt(0, &shellItem);
LPTSTR pszPath; LPTSTR pszPath;
// Retrieves the entire file system path of the file from its shell item // Retrieves the entire file system path of the file from its shell item
shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath); HRESULT getDisplayResult = shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);
if (S_OK != getDisplayResult || nullptr == pszPath)
{
// Avoid crashes in the following code.
return E_FAIL;
}
LPTSTR pszExt = PathFindExtension(pszPath); LPTSTR pszExt = PathFindExtension(pszPath);
if (nullptr == pszExt)
{
CoTaskMemFree(pszPath);
// Avoid crashes in the following code.
return E_FAIL;
}
// TODO: Instead, detect whether there's a WIC codec installed that can handle this file // TODO: Instead, detect whether there's a WIC codec installed that can handle this file
AssocGetPerceivedType(pszExt, &type, &flag, NULL); AssocGetPerceivedType(pszExt, &type, &flag, NULL);