Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 12:26:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSDM] Explicitly check DMI strings for NULL pointers

Browse source 
...to make CRT string comparison functions happy. CORE-15403
This commit is contained in:
Stanislav Motylkov 2018-11-30 16:55:29 +03:00
parent 8c710dc518
commit ed7a78e97a
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dll/cpl/sysdm/smbios.c
View file

@ -331,6 +331,7 @@ void AppendSystemFamily(PWSTR pBuf, SIZE_T cchBuf, PCHAR * DmiStrings, PWSTR dev
if (wcsistr(dev, wideStr) == NULL && if (wcsistr(dev, wideStr) == NULL &&
(!Aliases[i] || wcsistr(dev, Aliases[i]) == NULL) && (!Aliases[i] || wcsistr(dev, Aliases[i]) == NULL) &&
DmiStrings[SYS_FAMILY] != NULL &&
!stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i])) !stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i]))
{ {
if (wcslen(pBuf) > 0 && wcslen(dev) > 0) if (wcslen(pBuf) > 0 && wcslen(dev) > 0)
@ -514,7 +515,8 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf)
{ {
StringCchCopyW(ven, _countof(ven), L"Lenovo"); StringCchCopyW(ven, _countof(ven), L"Lenovo");
if (stricmp(DmiStrings[SYS_VERSION], "Lenovo") && if (DmiStrings[SYS_VERSION] != NULL &&
stricmp(DmiStrings[SYS_VERSION], "Lenovo") &&
stricmp(DmiStrings[SYS_VERSION], "Lenovo Product") && stricmp(DmiStrings[SYS_VERSION], "Lenovo Product") &&
stricmp(DmiStrings[SYS_VERSION], " ") && stricmp(DmiStrings[SYS_VERSION], " ") &&
_strnicmp(DmiStrings[SYS_VERSION], " ", 3) && _strnicmp(DmiStrings[SYS_VERSION], " ", 3) &&
@ -545,8 +547,9 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf)
// workaround for DEXP // workaround for DEXP
if (!wcscmp(ven, L"DEXP")) if (!wcscmp(ven, L"DEXP"))
{ {
if (!stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") if (DmiStrings[SYS_PRODUCT] != NULL &&
&& DmiStrings[SYS_VERSION] != NULL) !stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") &&
DmiStrings[SYS_VERSION] != NULL)
{ {
GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE);
} }