Zebediah Figura : mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings.

Alexandre Julliard julliard at winehq.org
Thu Mar 26 16:27:23 CDT 2020


Module: wine
Branch: master
Commit: aafe39a8126ef3d500d70cd330cadf94f339568a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=aafe39a8126ef3d500d70cd330cadf94f339568a

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Mar 25 18:17:02 2020 -0500

mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings.

kernel32 actually already assumes this.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mountmgr.sys/mountmgr.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index 3331eedf8d..dd3a3932b4 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -311,6 +311,11 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize,
 
     input = NULL;
     output = buff;
+    output->size = size;
+    output->letter = letter;
+    output->type = type;
+    output->mount_point_offset = 0;
+    output->device_offset = 0;
 
     if (size > outsize)
     {
@@ -328,9 +333,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize,
         status = STATUS_MORE_ENTRIES;
         goto done;
     }
-    output->size = size;
-    output->letter = letter;
-    output->type = type;
+
     ptr = (char *)(output + 1);
 
     if (mount_point)




More information about the wine-cvs mailing list