Changeset 104344 in vbox

Timestamp:

Apr 17, 2024 1:19:20 PM (10 months ago)

Author:

vboxsync

Message:

Additions: Linux: UBSAN: make r161313 less ugly, bugref:10585.

Location:

trunk

Files:

• include/VBox/VBoxGuestLibSharedFoldersInline.h (modified) (1 diff)
• src/VBox/Additions/linux/sharedfolders/dirops.c (modified) (3 diffs)
• src/VBox/Additions/linux/sharedfolders/utils.c (modified) (1 diff)

trunk/include/VBox/VBoxGuestLibSharedFoldersInline.h

@@ -1503 +1503 @@
         if (pReq)
         {
+            char *ach = pReq->StrPath.String.ach;
             pReq->StrPath.u16Length = (uint16_t)cchPath;
             pReq->StrPath.u16Size   = (uint16_t)cchPath + 1;
             RT_BCOPY_UNFORTIFIED(pReq->StrPath.String.ach, pszPath, cchPath);
-            *(pReq->StrPath.String.ach + cchPath) = '\0';
+            ach[cchPath] = '\0';
 
             {

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

@@ -487 +487 @@
             uint16_t        cbSrcName;
             uint16_t        cchSrcName;
+            char            *ach = pEntry->name.String.ach;
             AssertLogRelMsgBreak(offEntryInBuf + RT_UOFFSETOF(SHFLDIRINFO, name.String) <= cbValid,
                                  ("%#llx + %#x vs %#x\n", offEntryInBuf, RT_UOFFSETOF(SHFLDIRINFO, name.String), cbValid));
@@ -493 +494 @@
             AssertLogRelBreak(offEntryInBuf + RT_UOFFSETOF(SHFLDIRINFO, name.String) + cbSrcName <= cbValid);
             AssertLogRelBreak(cchSrcName < cbSrcName);
-            AssertLogRelBreak(*(pEntry->name.String.ach + cchSrcName) == '\0');
+            AssertLogRelBreak(ach[cchSrcName] == '\0');
 
             /*
@@ -501 +502 @@
                 || pEntry->name.String.ach[0] != '.'
                 || (   cchSrcName == 2
-                    && *(pEntry->name.String.ach + 1) != '.')) {
+                    && ach[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 {
-        RT_BCOPY_UNFORTIFIED(&tmp->String.utf8[0], p_name, p_len);
-        *(tmp->String.utf8 + p_len) = '/';
-        RT_BCOPY_UNFORTIFIED(tmp->String.utf8 + p_len + 1, d_name, d_len);
-        *(tmp->String.utf8 + p_len + 1 + d_len) = '\0';
+        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';
     }