Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32][SHELLEXT] IEnumIDList::Next must handle pceltFetched and memory errors correctly (#5820)

Browse source 
- pceltFetched can be NULL if the caller is not requesting multiple items.
- All entries returned in rgelt must be valid, they cannot be NULL.
This commit is contained in:
Whindmar Saksit 2023-11-13 16:31:37 +01:00 committed by GitHub
parent b4b1c5b9aa
commit f283a3f9ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dll/shellext/fontext/CEnumFonts.cpp
View file

@ -36,9 +36,10 @@ public:
// *** IEnumIDList methods ***
STDMETHODIMP Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched)
{
if (!pceltFetched || !rgelt)
if (!rgelt || (!pceltFetched && celt != 1))
return E_POINTER;
HRESULT hr = S_OK;
ULONG Fetched = 0;
while (celt)
@ -48,15 +49,25 @@ public:
if (m_Index < g_FontCache->Size())
{
CStringW Name = g_FontCache->Name(m_Index);
rgelt[Fetched] = _ILCreate(Name, m_Index);
LPITEMIDLIST item = _ILCreate(Name, m_Index);
if (!item)
{
hr = Fetched ? S_FALSE : E_OUTOFMEMORY;
break;
}
rgelt[Fetched] = item;
m_Index++;
Fetched++;
}
else
{
hr = S_FALSE;
}
}
*pceltFetched = Fetched;
return Fetched ? S_OK : S_FALSE;
if (pceltFetched)
*pceltFetched = Fetched;
return hr;
}
STDMETHODIMP Skip(ULONG celt)
{

8
dll/shellext/netshell/enumlist.cpp
View file

@ -277,9 +277,17 @@ CEnumIDList::Next(
for (i = 0; i < celt; i++)
{
if (!m_pCurrent)
{
hr = S_FALSE;
break;
}
temp = ILClone(m_pCurrent->pidl);
if (!temp)
{
hr = i ? S_FALSE : E_OUTOFMEMORY;
break;
}
rgelt[i] = temp;
m_pCurrent = m_pCurrent->pNext;
}

24
dll/shellext/zipfldr/CEnumZipContents.cpp
View file

@ -34,25 +34,25 @@ public:
// *** IEnumIDList methods ***
STDMETHODIMP Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched)
{
if (!pceltFetched || !rgelt)
if (!rgelt || (!pceltFetched && celt != 1))
return E_POINTER;
*pceltFetched = 0;
if (celt != 1)
return E_FAIL;
LPITEMIDLIST item;
CStringW name;
bool dir;
unz_file_info64 info;
if (mEnumerator.next_unique(m_Prefix, name, dir, info))
for (ULONG i = 0; i < celt; ++i)
{
*pceltFetched = 1;
*rgelt = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info);
return S_OK;
if (pceltFetched)
*pceltFetched = i;
if (!mEnumerator.next_unique(m_Prefix, name, dir, info))
return S_FALSE;
item = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info);
if (!item)
return i ? S_FALSE : E_OUTOFMEMORY;
rgelt[i] = item;
}
return S_FALSE;
return S_OK;
}
STDMETHODIMP Skip(ULONG celt)
{

6
dll/win32/shell32/CEnumIDListBase.cpp
View file

@ -172,9 +172,15 @@ HRESULT WINAPI CEnumIDListBase::Next(
for(i = 0; i < celt; i++)
{ if(!mpCurrent)
{ hr = S_FALSE;
break;
}
temp = ILClone(mpCurrent->pidl);
if (!temp)
{ hr = i ? S_FALSE : E_OUTOFMEMORY;
break;
}
rgelt[i] = temp;
mpCurrent = mpCurrent->pNext;
}