Changeset 79110 in vbox for trunk/src/VBox/Additions/os2

Timestamp:

Jun 13, 2019 12:17:25 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131272

Message:

os2/VBoxSF: Forgot to set fpGEAList to NULL when full EAs are queried. FC/2 paniced the guest copying files off shared folder.

Location:

trunk/src/VBox/Additions/os2/VBoxSF

Files:

• VBoxSF.cpp (modified) (1 diff)
• VBoxSFUtil.cpp (modified) (1 diff)

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSF.cpp

@@ -2126 +2126 @@
         Log2(("vboxSfOs2MakeEmptyEaList: #0: %p %p %#x\n", EaOp.fpGEAList, EaOp.fpFEAList, EaOp.oError));
         EaOp.fpFEAList = (PFEALIST)KernSelToFlat((uintptr_t)EaOp.fpFEAList);
-        EaOp.fpGEAList = (PGEALIST)KernSelToFlat((uintptr_t)EaOp.fpGEAList);
+        if (   uLevel != FI_LVL_EAS_FULL
+            && uLevel != FI_LVL_EAS_FULL_5
+            && uLevel != FI_LVL_EAS_FULL_8)
+            EaOp.fpGEAList = (PGEALIST)KernSelToFlat((uintptr_t)EaOp.fpGEAList);
+        else
+            EaOp.fpGEAList = NULL;
         Log2(("vboxSfOs2MakeEmptyEaList: #0b: %p %p\n", EaOp.fpGEAList, EaOp.fpFEAList));
 

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFUtil.cpp

@@ -331 +331 @@
             printf("%s: FIL_QUERYEASFROMLISTL -> %u\n", argv[i], rc);
 
-        EaOp.fpGEA2List = (PGEA2LIST)memcpy(&Gea2List, &Gea2ListOrg, sizeof(Gea2List));
+        //EaOp.fpGEA2List = (PGEA2LIST)memcpy(&Gea2List, &Gea2ListOrg, sizeof(Gea2List));
+        EaOp.fpGEA2List = (PGEA2LIST)0xfefefef7;
         EaOp.fpFEA2List = &u.FeaList;
         EaOp.oError     = 0;