[PATCH 0/1] MR5011: msi: Don't write past end of string when selecting parent directory

[Fabian Maurer (＠DarkShadow44)]

This shouldn't happen, but due to other current issues it's possible. IMHO it shouldn't hurt to add a check to not corrupt memory here.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5011

[PATCH 1/1] msi: Don't write past end of string when selecting parent directory

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

---
 dlls/msi/dialog.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index ba8ca526266..f70b127a7a5 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -2862,8 +2862,11 @@ static UINT dialog_directorylist_up( msi_dialog *dialog )
 
     /* strip off the last directory */
     ptr = PathFindFileNameW( path );
-    if (ptr != path) *(ptr - 1) = '\0';
-    PathAddBackslashW( path );
+    if (ptr != path)
+    {
+        *(ptr - 1) = '\0';
+        PathAddBackslashW( path );
+    }
 
     dialog_set_property( dialog->package, prop, path );
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5011

[PATCH 0/1] MR5011: msi: Don't write past end of string when selecting parent directory - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5011