Changeset 104345 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Apr 17, 2024 1:55:40 PM (10 months ago)

Author:

vboxsync

Message:

Additions: Linux: UBSAN: vboxsf: update naming for r162827, bugref:10585.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (3 diffs)
• utils.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -487 +487 @@
             uint16_t        cbSrcName;
             uint16_t        cchSrcName;
-            char            *ach = pEntry->name.String.ach;
+            char            *pszSrcName = pEntry->name.String.ach;
             AssertLogRelMsgBreak(offEntryInBuf + RT_UOFFSETOF(SHFLDIRINFO, name.String) <= cbValid,
                                  ("%#llx + %#x vs %#x\n", offEntryInBuf, RT_UOFFSETOF(SHFLDIRINFO, name.String), cbValid));
@@ -494 +494 @@
             AssertLogRelBreak(offEntryInBuf + RT_UOFFSETOF(SHFLDIRINFO, name.String) + cbSrcName <= cbValid);
             AssertLogRelBreak(cchSrcName < cbSrcName);
-            AssertLogRelBreak(ach[cchSrcName] == '\0');
+            AssertLogRelBreak(pszSrcName[cchSrcName] == '\0');
 
             /*
@@ -502 +502 @@
                 || pEntry->name.String.ach[0] != '.'
                 || (   cchSrcName == 2
-                    && ach[1] != '.')) {
+                    && pszSrcName[1] != '.')) {
                 int const   d_type = vbsf_get_d_type(pEntry->Info.Attr.fMode);
                 ino_t const d_ino  = (ino_t)offPos + 0xbeef; /* very fake */

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -1048 +1048 @@
         RT_BCOPY_UNFORTIFIED(&tmp->String.utf8[0], d_name, d_len + 1);
     else {
-        uint8_t *pUtf8 = tmp->String.utf8;
-        RT_BCOPY_UNFORTIFIED(&pUtf8[0], p_name, p_len);
-        pUtf8[p_len] = '/';
-        RT_BCOPY_UNFORTIFIED(&pUtf8[p_len + 1], d_name, d_len);
-        pUtf8[p_len + 1 + d_len] = '\0';
+        uint8_t *pszPath = tmp->String.utf8;
+        RT_BCOPY_UNFORTIFIED(&pszPath[0], p_name, p_len);
+        pszPath[p_len] = '/';
+        RT_BCOPY_UNFORTIFIED(&pszPath[p_len + 1], d_name, d_len);
+        pszPath[p_len + 1 + d_len] = '\0';
     }