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

[SHELL32] CPrinterFolder: Validate string pointers properly. (#4486)

Browse source 
CORE-18174

Check string pointers before determining the length of strings.
This commit is contained in:
Raymond Czerny 2022-05-05 16:24:38 +02:00 committed by GitHub
parent 056bb94edc
commit e0b9d6d9cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dll/win32/shell32/folders/CPrinterFolder.cpp
View file

@ -102,10 +102,13 @@ static LPITEMIDLIST _ILCreatePrinterItem(PRINTER_INFO_4W *pi)
PIDLPrinterStruct * p;
int size0 = (char*)&tmp.u.cprinter.szName - (char*)&tmp.u.cprinter;
int size = size0;
SIZE_T cchPrinterName, cchServerName;
SIZE_T cchPrinterName = 0;
SIZE_T cchServerName = 0;
cchPrinterName = wcslen(pi->pPrinterName);
cchServerName = wcslen(pi->pServerName);
if (pi->pPrinterName)
cchPrinterName = wcslen(pi->pPrinterName);
if (pi->pServerName)
cchServerName = wcslen(pi->pServerName);
if ((cchPrinterName + cchServerName) > (MAXUSHORT - 2))
{
return NULL;