Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bounds checking in SHELL_GetPathFromIDListA/W()

Browse source 
svn path=/trunk/; revision=8119
This commit is contained in:
Martin Fuchs 2004-02-09 22:33:05 +00:00
parent a505cc660f
commit 04866685b1
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/lib/shell32/pidl.c
View file

@ -1291,6 +1291,8 @@ HRESULT SHELL_GetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSiz
LPSTR end = pszPath + uOutSize;
HRESULT hr = S_OK;
pszPath[0] = '\0';
/* One case is a PIDL rooted at desktop level */
if (_ILIsValue(pidl) || _ILIsFolder(pidl)) {
hr = SHGetSpecialFolderPathA(0, pstr, CSIDL_DESKTOP, FALSE);
@ -1313,6 +1315,10 @@ HRESULT SHELL_GetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSiz
if (!txt)
{hr = E_INVALIDARG; break;}
/* make sure there's enough space for the next segment */
if (pstr+lstrlenA(txt) >= end)
{hr = E_INVALIDARG; break;}
lstrcpynA(pstr, txt, end-pstr);
pidl = ILGetNext(pidl);
@ -1324,6 +1330,9 @@ HRESULT SHELL_GetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSiz
break;
}
if (pstr+1 >= end)
{hr = E_INVALIDARG; break;}
pstr = PathAddBackslashA(pstr);
if (!pstr)
{hr = E_INVALIDARG; break;}
@ -1374,6 +1383,8 @@ HRESULT SHELL_GetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSi
LPWSTR end = pszPath + uOutSize;
HRESULT hr = S_OK;
pszPath[0] = '\0';
/* One case is a PIDL rooted at desktop level */
if (_ILIsValue(pidl) || _ILIsFolder(pidl)) {
hr = SHGetSpecialFolderPathW(0, pstr, CSIDL_DESKTOP, FALSE);
@ -1396,6 +1407,10 @@ HRESULT SHELL_GetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSi
if (!txt)
{hr = E_INVALIDARG; break;}
/* make sure there's enough space for the next segment */
if (pstr+lstrlenA(txt) >= end)
{hr = E_INVALIDARG; break;}
if (!MultiByteToWideChar(CP_ACP, 0, txt, -1, pstr, uOutSize))
{hr = E_OUTOFMEMORY; break;}
@ -1408,6 +1423,9 @@ HRESULT SHELL_GetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSi
break;
}
if (pstr+1 >= end)
{hr = E_INVALIDARG; break;}
pstr = PathAddBackslashW(pstr);
if (!pstr)
{hr = E_INVALIDARG; break;}