From 4321c975c76aa149b8b624f360a196eaabf85f54 Mon Sep 17 00:00:00 2001 From: Whindmar Saksit Date: Wed, 12 Jun 2024 19:34:48 +0200 Subject: [PATCH] [SETUPAPI] Fix absolute dirid ProfileItems bug (#7016) --- dll/win32/setupapi/install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/install.c b/dll/win32/setupapi/install.c index f8c4b53e46c..8cc93d047bf 100644 --- a/dll/win32/setupapi/install.c +++ b/dll/win32/setupapi/install.c @@ -844,8 +844,10 @@ static BOOL Concatenate(int DirId, LPCWSTR SubDirPart, LPCWSTR NamePart, LPWSTR *pFullName = NULL; Dir = DIRID_get_string(DirId); - if (Dir) + if (Dir && *Dir) dwRequired += wcslen(Dir) + 1; + else + Dir = NULL; /* DIRID_get_string returns L"" for DIRID_ABSOLUTE */ if (SubDirPart) dwRequired += wcslen(SubDirPart) + 1; if (NamePart)