timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-10-08 11:39:06 +11:00
Code Issues Packages Projects Releases Wiki Activity

Validate cached icon indices before remapping (#2549)

Browse Source
This commit is contained in:
YellowNest
2026-10-04 17:45:54 +02:00
committed by GitHub
parent 1e7a52a5ab
commit 523ff4b9f4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/StartMenu/StartMenuDLL/ItemManager.cpp
+3 -3
View File
@@ -3337,19 +3337,19 @@ void CItemManager::LoadCacheFile( void )
info.iconColor=data.iconColor; info.iconColor=data.iconColor;
info.iconIndex=data.iconIndex; info.iconIndex=data.iconIndex;
info.smallIcon=data.smallIcon<(int)remapIcons.size()?remapIcons[data.smallIcon]:NULL; info.smallIcon=data.smallIcon>=0 && (size_t)data.smallIcon<remapIcons.size()?remapIcons[data.smallIcon]:NULL;
if (!info.smallIcon) if (!info.smallIcon)
{ {
info.validFlags&=~INFO_SMALL_ICON; info.validFlags&=~INFO_SMALL_ICON;
info.smallIcon=m_DefaultSmallIcon; info.smallIcon=m_DefaultSmallIcon;
} }
info.largeIcon=data.largeIcon<(int)remapIcons.size()?remapIcons[data.largeIcon]:NULL; info.largeIcon=data.largeIcon>=0 && (size_t)data.largeIcon<remapIcons.size()?remapIcons[data.largeIcon]:NULL;
if (!info.largeIcon) if (!info.largeIcon)
{ {
info.validFlags&=~INFO_LARGE_ICON; info.validFlags&=~INFO_LARGE_ICON;
info.largeIcon=m_DefaultLargeIcon; info.largeIcon=m_DefaultLargeIcon;
} }
info.extraLargeIcon=data.extraLargeIcon<(int)remapIcons.size()?remapIcons[data.extraLargeIcon]:NULL; info.extraLargeIcon=data.extraLargeIcon>=0 && (size_t)data.extraLargeIcon<remapIcons.size()?remapIcons[data.extraLargeIcon]:NULL;
if (!info.extraLargeIcon) if (!info.extraLargeIcon)
{ {
info.validFlags&=~INFO_EXTRA_LARGE_ICON; info.validFlags&=~INFO_EXTRA_LARGE_ICON;