[ros-diffs] [reactos] 01/01: [SYSDM] Explicitly check DMI strings for NULL pointers

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed7a78e97a79e08304590…

commit ed7a78e97a79e083045909c4421bc5512f3d0062
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Fri Nov 30 16:55:29 2018 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Fri Nov 30 16:55:29 2018 +0300

    [SYSDM] Explicitly check DMI strings for NULL pointers
    
    ...to make CRT string comparison functions happy. CORE-15403
---
 dll/cpl/sysdm/smbios.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c
index 5c7e38e467..d7d49976ee 100644
--- a/dll/cpl/sysdm/smbios.c
+++ b/dll/cpl/sysdm/smbios.c
@@ -331,6 +331,7 @@ void AppendSystemFamily(PWSTR pBuf, SIZE_T cchBuf, PCHAR * DmiStrings,
PWSTR dev
 
         if (wcsistr(dev, wideStr) == NULL &&
             (!Aliases[i] || wcsistr(dev, Aliases[i]) == NULL) &&
+            DmiStrings[SYS_FAMILY] != NULL &&
             !stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i]))
         {
             if (wcslen(pBuf) > 0 && wcslen(dev) > 0)
@@ -514,7 +515,8 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf)
     {
         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], " ") &&
             _strnicmp(DmiStrings[SYS_VERSION], "   ", 3) &&
@@ -545,8 +547,9 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf)
     // workaround for DEXP
     if (!wcscmp(ven, L"DEXP"))
     {
-        if (!stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC")
-            && DmiStrings[SYS_VERSION] != NULL)
+        if (DmiStrings[SYS_PRODUCT] != NULL &&
+            !stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") &&
+            DmiStrings[SYS_VERSION] != NULL)
         {
             GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE);
         }