From 41f09715709a8f1771018bb39334cfdbc3f01e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 11 May 2024 15:09:48 +0800 Subject: [PATCH] PhysicalMemory: ignore trash values --- src/detection/physicalmemory/physicalmemory_apple.m | 3 +++ src/util/smbiosHelper.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m index 8101184e6..950f1b256 100644 --- a/src/detection/physicalmemory/physicalmemory_apple.m +++ b/src/detection/physicalmemory/physicalmemory_apple.m @@ -1,5 +1,6 @@ #include "physicalmemory.h" #include "common/processing.h" +#include "util/smbiosHelper.h" #include "util/stringUtils.h" #import @@ -20,7 +21,9 @@ static void appendDevice( ffStrbufInit(&device->formFactor); ffStrbufInitS(&device->deviceLocator, deviceLocator.UTF8String); ffStrbufInitS(&device->vendor, vendor.UTF8String); + ffCleanUpSmbiosValue(&device->vendor); ffStrbufInitS(&device->serial, serial.UTF8String); + ffCleanUpSmbiosValue(&device->serial); device->size = 0; device->maxSpeed = 0; device->runningSpeed = 0; diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c index b9418cab9..29265d03a 100644 --- a/src/util/smbiosHelper.c +++ b/src/util/smbiosHelper.c @@ -11,10 +11,8 @@ bool ffIsSmbiosValueSet(FFstrbuf* value) !ffStrbufStartsWithIgnCaseS(value, "To be set") && !ffStrbufStartsWithIgnCaseS(value, "OEM") && !ffStrbufStartsWithIgnCaseS(value, "O.E.M.") && + !ffStrbufStartsWithIgnCaseS(value, "System Product") && !ffStrbufIgnCaseEqualS(value, "None") && - !ffStrbufIgnCaseEqualS(value, "System Product") && - !ffStrbufIgnCaseEqualS(value, "System Product Name") && - !ffStrbufIgnCaseEqualS(value, "System Product Version") && !ffStrbufIgnCaseEqualS(value, "System Name") && !ffStrbufIgnCaseEqualS(value, "System Version") && !ffStrbufIgnCaseEqualS(value, "Default string") && @@ -28,7 +26,8 @@ bool ffIsSmbiosValueSet(FFstrbuf* value) !ffStrbufIgnCaseEqualS(value, "No Enclosure") && !ffStrbufIgnCaseEqualS(value, "Chassis Version") && !ffStrbufIgnCaseEqualS(value, "All Series") && - !ffStrbufIgnCaseEqualS(value, "N/A") + !ffStrbufIgnCaseEqualS(value, "N/A") && + !ffStrbufIgnCaseEqualS(value, "0x0000") ; }