Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-13 02:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ZIPFLDR] Fix off-by-one count error during enumeration (#6040)

Browse source 
CORE-19342
This commit is contained in:
Whindmar Saksit 2023-11-26 13:41:02 +01:00 • committed by GitHub
parent af7defb556
commit c7777f5963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,22 +37,35 @@ public:
if (!rgelt || (!pceltFetched && celt != 1)) if (!rgelt || (!pceltFetched && celt != 1))
return E_POINTER; return E_POINTER;
HRESULT hr = S_OK;
ULONG fetched = 0;
LPITEMIDLIST item; LPITEMIDLIST item;
CStringW name; CStringW name;
bool dir; bool dir;
unz_file_info64 info; unz_file_info64 info;
for (ULONG i = 0; i < celt; ++i)
while (fetched < celt)
{
if (mEnumerator.next_unique(m_Prefix, name, dir, info))
{ {
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); item = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info);
if (!item) if (!item)
return i ? S_FALSE : E_OUTOFMEMORY; {
rgelt[i] = item; hr = fetched ? S_FALSE : E_OUTOFMEMORY;
break;
} }
return S_OK; rgelt[fetched++] = item;
}
else
{
hr = S_FALSE;
break;
}
}
if (pceltFetched)
*pceltFetched = fetched;
return hr;
} }
STDMETHODIMP Skip(ULONG celt) STDMETHODIMP Skip(ULONG celt)
{ {