From b3094aa0010d28928a1d07f0b7edc828999a63fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 11 Jul 2024 17:56:30 +0200 Subject: [PATCH] [APPHELP] Fix MAX_GUID_STRING_LEN define; use it for one buffer (#7137) --- dll/appcompat/apphelp/apphelp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.c b/dll/appcompat/apphelp/apphelp.c index fd7a069468a..34bcd564589 100644 --- a/dll/appcompat/apphelp/apphelp.c +++ b/dll/appcompat/apphelp/apphelp.c @@ -26,7 +26,8 @@ const UNICODE_STRING InstalledSDBKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Mac /* from dpfilter.h */ #define DPFLTR_APPCOMPAT_ID 123 -#define MAX_GUID_STRING_LEN sizeof("{12345678-1234-1234-0123-456789abcdef}") +#define MAX_GUID_STRING_LEN RTL_NUMBER_OF("{12345678-1234-1234-0123-456789abcdef}") +C_ASSERT(MAX_GUID_STRING_LEN == 39); // See psdk/cfgmgr32.h #ifndef NT_SUCCESS #define NT_SUCCESS(StatCode) ((NTSTATUS)(StatCode) >= 0) @@ -405,7 +406,7 @@ BOOL WINAPI SdbRegisterDatabase( */ BOOL WINAPI SdbUnregisterDatabase(_In_ const GUID *pguidDB) { - WCHAR KeyBuffer[MAX_PATH], GuidBuffer[50]; + WCHAR KeyBuffer[MAX_PATH], GuidBuffer[MAX_GUID_STRING_LEN]; UNICODE_STRING KeyName; ACCESS_MASK KeyAccess; OBJECT_ATTRIBUTES ObjectKey = RTL_INIT_OBJECT_ATTRIBUTES(&KeyName, OBJ_CASE_INSENSITIVE);