Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPAPI] Add missing NULL parameter checks in SetupOpenInfFileW and SetupDiGetINFClassW.

Browse source 
Based on PR #5673, ROSTESTS-388

Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
This commit is contained in:
Hermès Bélusca-Maïto 2023-09-28 12:50:49 +02:00
parent b28264a9cc
commit d78a4a308a
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dll/win32/setupapi/parser.c
View file

@ -1232,11 +1232,18 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err
TRACE("%s %s %lx %p\n", debugstr_w(name), debugstr_w(class), style, error); TRACE("%s %s %lx %p\n", debugstr_w(name), debugstr_w(class), style, error);
#ifdef __REACTOS__
if (style & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)) if (style & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4))
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return (HINF)INVALID_HANDLE_VALUE; return (HINF)INVALID_HANDLE_VALUE;
} }
if (!name)
{
SetLastError(ERROR_INVALID_PARAMETER);
return (HINF)INVALID_HANDLE_VALUE;
}
#endif // __REACTOS__
if (wcschr( name, '\\' ) || wcschr( name, '/' )) if (wcschr( name, '\\' ) || wcschr( name, '/' ))
{ {
@ -2329,6 +2336,12 @@ SetupDiGetINFClassW(
TRACE("%s %p %p %ld %p\n", debugstr_w(InfName), ClassGuid, TRACE("%s %p %p %ld %p\n", debugstr_w(InfName), ClassGuid,
ClassName, ClassNameSize, RequiredSize); ClassName, ClassNameSize, RequiredSize);
if (!InfName || !ClassGuid || !ClassName || ClassNameSize == 0)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
/* Open .inf file */ /* Open .inf file */
hInf = SetupOpenInfFileW(InfName, NULL, INF_STYLE_WIN4, NULL); hInf = SetupOpenInfFileW(InfName, NULL, INF_STYLE_WIN4, NULL);
if (hInf == INVALID_HANDLE_VALUE) if (hInf == INVALID_HANDLE_VALUE)