summaryrefslogtreecommitdiffstats
path: root/include/VBox
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:47:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:47:04 +0000
commit8b152439beb81c8da1bdb00c7870e2d9e8d49612 (patch)
treeea7e527f7531053d0bcc60ce1eea46e1c4b15757 /include/VBox
parentAdding debian version 7.0.16-dfsg-8. (diff)
downloadvirtualbox-8b152439beb81c8da1bdb00c7870e2d9e8d49612.tar.xz
virtualbox-8b152439beb81c8da1bdb00c7870e2d9e8d49612.zip
Merging upstream version 7.0.18-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/VBox')
-rw-r--r--include/VBox/VBoxGuestLibSharedFoldersInline.h5
-rw-r--r--include/VBox/intnet.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/include/VBox/VBoxGuestLibSharedFoldersInline.h b/include/VBox/VBoxGuestLibSharedFoldersInline.h
index 6bfdd982..7b8e3e6e 100644
--- a/include/VBox/VBoxGuestLibSharedFoldersInline.h
+++ b/include/VBox/VBoxGuestLibSharedFoldersInline.h
@@ -1502,10 +1502,11 @@ DECLINLINE(int) VbglR0SfHostReqReadLinkContigSimple(SHFLROOT idRoot, const char
+ SHFLSTRING_HEADER_SIZE + (uint32_t)cchPath);
if (pReq)
{
+ char * const pszReqPath = 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';
+ RT_BCOPY_UNFORTIFIED(pszReqPath, pszPath, cchPath);
+ pszReqPath[cchPath] = '\0';
{
int vrc = VbglR0SfHostReqReadLinkContig(idRoot, pvBuf, PhysBuffer, cbBuffer, pReq);
diff --git a/include/VBox/intnet.h b/include/VBox/intnet.h
index 2e593067..c0708cfe 100644
--- a/include/VBox/intnet.h
+++ b/include/VBox/intnet.h
@@ -348,7 +348,7 @@ typedef struct INTNETSG
uint16_t volatile fFlags;
#if ARCH_BITS == 64
/** Alignment padding. */
- uint16_t uPadding;
+ uint32_t uPadding;
#endif
/** The number of segments allocated. */
uint16_t cSegsAlloc;