Changeset 66768 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 4, 2017 12:59:27 AM (8 years ago)

Author:

vboxsync

Message:

iso9660: build fixes

File:

• trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp

@@ -794 +794 @@
     uint32_t        offEntryInDir   = 0;
     uint32_t const  cbDir           = pThis->Core.cbObject;
-    while (offEntryInDir + RT_OFFSETOF(ISO9660DIRREC, achFileId) <= cbDir)
+    while (offEntryInDir + RT_UOFFSETOF(ISO9660DIRREC, achFileId) <= cbDir)
     {
         PCISO9660DIRREC pDirRec = (PCISO9660DIRREC)&pThis->pbDir[offEntryInDir];
@@ -1223 +1223 @@
                 && pDirRec->achFileId[0]  == '\0')
             {
-                if (*pcbDirEntry < RT_OFFSETOF(RTDIRENTRYEX, szName) + 2)
+                if (*pcbDirEntry < RT_UOFFSETOF(RTDIRENTRYEX, szName) + 2)
                 {
-                    *pcbDirEntry = RT_OFFSETOF(RTDIRENTRYEX, szName) + 2;
+                    *pcbDirEntry = RT_UOFFSETOF(RTDIRENTRYEX, szName) + 2;
                     return VERR_BUFFER_OVERFLOW;
                 }
@@ -1233 +1233 @@
             }
             else if (   pDirRec->bFileIdLength == 1
-                     && pDirRec->achFileId[0]  == '\0')
+                     && pDirRec->achFileId[0]  == '\1')
             {
-                if (*pcbDirEntry < RT_OFFSETOF(RTDIRENTRYEX, szName) + 3)
+                if (*pcbDirEntry < RT_UOFFSETOF(RTDIRENTRYEX, szName) + 3)
                 {
-                    *pcbDirEntry = RT_OFFSETOF(RTDIRENTRYEX, szName) + 3;
+                    *pcbDirEntry = RT_UOFFSETOF(RTDIRENTRYEX, szName) + 3;
                     return VERR_BUFFER_OVERFLOW;
                 }
@@ -1250 +1250 @@
                 PCRTUTF16 pwcSrc    = (PCRTUTF16)&pDirRec->achFileId[0];
                 PCRTUTF16 pwcSrcEnd = &pwcSrc[pDirRec->bFileIdLength / sizeof(RTUTF16)];
-                size_t    cbDst     = *pcbDirEntry - RT_OFFSETOF(RTDIRENTRYEX, szName);
-                char     *pszDst    = pDirEntry->szName;
+                size_t    cbDst     = *pcbDirEntry - RT_UOFFSETOF(RTDIRENTRYEX, szName);
+                size_t    offDst    = 0;
                 while ((uintptr_t)pwcSrc < (uintptr_t)pwcSrcEnd)
                 {
@@ -1258 +1258 @@
                     if (RT_FAILURE(rc))
                         uc = '?';
+                    else if (!uc)
+                        break;
                     size_t cchCp = RTStrCpSize(uc);
-                    if (cchCp < cbDst)
+                    if (offDst + cchCp < cbDst)
                     {
-                        cbDst -= cchCp;
-                        pszDst = RTStrPutCp(pszDst, uc);
+                        RTStrPutCp(&pDirEntry->szName[offDst], uc);
+                        offDst += cchCp;
                     }
                     else
                     {
                         /* Buffer overflow.  Figure out how much we really need. */
-                        size_t off = pszDst - &pDirEntry->szName[0];
-                        off += cchCp;
+                        offDst += cchCp;
                         while ((uintptr_t)pwcSrc < (uintptr_t)pwcSrcEnd)
                         {
                             RTUtf16BigGetCpEx(&pwcSrc, &uc);
-                            off += RTStrCpSize(uc);
+                            offDst += RTStrCpSize(uc);
                         }
-                        *pcbDirEntry = RT_OFFSETOF(RTDIRENTRYEX, szName) + off + 1;
+                        *pcbDirEntry = RT_UOFFSETOF(RTDIRENTRYEX, szName) + offDst + 1;
                         return VERR_BUFFER_OVERFLOW;
                     }
                 }
-                *pszDst = '\0';
+                pDirEntry->szName[offDst] = '\0';
+                pDirEntry->cbName = (uint16_t)offDst;
             }
             else
             {
                 /* This is supposed to be upper case ASCII, however, purge the encoding anyway. */
-                size_t cbNeeded = RT_OFFSETOF(RTDIRENTRYEX, szName) + pDirRec->bFileIdLength + 1;
+                size_t cbNeeded = RT_UOFFSETOF(RTDIRENTRYEX, szName) + pDirRec->bFileIdLength + 1;
                 if (*pcbDirEntry < cbNeeded)
                 {