Changeset 75045 in vbox

Timestamp:

Oct 24, 2018 2:46:53 PM (7 years ago)

Author:

vboxsync

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

126088

Message:

IPRT/RTFileReadAll*: Added RTFILE_RDALL_F_FAIL_ON_MAX_SIZE. bugref:9232

Location:

trunk

Files:

• include/iprt/file.h (modified) (1 diff)
• src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp (modified) (1 diff)

trunk/include/iprt/file.h

@@ -1131 +1131 @@
 #define RTFILE_RDALL_O_DENY_NOT_DELETE      RTFILE_O_DENY_NOT_DELETE
 #define RTFILE_RDALL_O_DENY_MASK            RTFILE_O_DENY_MASK
+/** Fail with VERR_OUT_OF_RANGE if the file size exceeds the specified maximum
+ * size.  The default behavior is to cap the size at cbMax. */
+#define RTFILE_RDALL_F_FAIL_ON_MAX_SIZE     RT_BIT_32(30)
 /** Add a trailing zero byte to facilitate reading text files. */
 #define RTFILE_RDALL_F_TRAILING_ZERO_BYTE   RT_BIT_32(31)
 /** Mask of valid flags. */
-#define RTFILE_RDALL_VALID_MASK             (RTFILE_RDALL_O_DENY_MASK | UINT32_C(0x80000000))
+#define RTFILE_RDALL_VALID_MASK             (RTFILE_RDALL_O_DENY_MASK | UINT32_C(0xc0000000))
 /** @} */
 

trunk/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp

@@ -53 +53 @@
          */
         RTFOFF cbFile;
-        rc = RTFileSeek(File, 0,RTFILE_SEEK_END, (uint64_t *)&cbFile);
+        AssertCompile(sizeof(cbFile) == sizeof(uint64_t));
+        rc = RTFileSeek(File, 0, RTFILE_SEEK_END, (uint64_t *)&cbFile);
         if (RT_SUCCESS(rc))
         {
             RTFOFF cbAllocFile = cbFile > off ? cbFile - off : 0;
-            if (cbAllocFile > cbMax)
+            if (cbAllocFile <= cbMax)
+            { /* likely */ }
+            else if (!(fFlags & RTFILE_RDALL_F_FAIL_ON_MAX_SIZE))
                 cbAllocFile = cbMax;
-            size_t cbAllocMem = (size_t)cbAllocFile;
-            if ((RTFOFF)cbAllocMem == cbAllocFile)
+            else
+                rc = VERR_OUT_OF_RANGE;
+            if (RT_SUCCESS(rc))
             {
-                /*
-                 * Try allocate the required memory and initialize the header (hardcoded fun).
-                 */
-                void *pvHdr = RTMemAlloc(cbAllocMem + 32 + (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE ? 1 : 0));
-                if (pvHdr)
+                size_t cbAllocMem = (size_t)cbAllocFile;
+                if ((RTFOFF)cbAllocMem == cbAllocFile)
                 {
-                    memset(pvHdr, 0xff, 32);
-                    *(size_t *)pvHdr = cbAllocMem;
+                    /*
+                     * Try allocate the required memory and initialize the header (hardcoded fun).
+                     */
+                    void *pvHdr = RTMemAlloc(cbAllocMem + 32 + (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE ? 1 : 0));
+                    if (pvHdr)
+                    {
+                        memset(pvHdr, 0xff, 32);
+                        *(size_t *)pvHdr = cbAllocMem;
 
-                    /*
-                     * Seek and read.
-                     */
-                    rc = RTFileSeek(File, off, RTFILE_SEEK_BEGIN, NULL);
-                    if (RT_SUCCESS(rc))
-                    {
-                        void *pvFile = (uint8_t *)pvHdr + 32;
-                        rc = RTFileRead(File, pvFile, cbAllocMem, NULL);
+                        /*
+                         * Seek and read.
+                         */
+                        rc = RTFileSeek(File, off, RTFILE_SEEK_BEGIN, NULL);
                         if (RT_SUCCESS(rc))
                         {
-                            if (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE)
-                                ((uint8_t *)pvFile)[cbAllocFile] = '\0';
+                            void *pvFile = (uint8_t *)pvHdr + 32;
+                            rc = RTFileRead(File, pvFile, cbAllocMem, NULL);
+                            if (RT_SUCCESS(rc))
+                            {
+                                if (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE)
+                                    ((uint8_t *)pvFile)[cbAllocFile] = '\0';
 
-                            /*
-                             * Success - fill in the return values.
-                             */
-                            *ppvFile = pvFile;
-                            *pcbFile = cbAllocMem;
+                                /*
+                                 * Success - fill in the return values.
+                                 */
+                                *ppvFile = pvFile;
+                                *pcbFile = cbAllocMem;
+                            }
                         }
+
+                        if (RT_FAILURE(rc))
+                            RTMemFree(pvHdr);
                     }
-
-                    if (RT_FAILURE(rc))
-                        RTMemFree(pvHdr);
+                    else
+                        rc = VERR_NO_MEMORY;
                 }
                 else
-                    rc = VERR_NO_MEMORY;
+                    rc = VERR_TOO_MUCH_DATA;
             }
-            else
-                rc = VERR_TOO_MUCH_DATA;
         }
         /* restore the position. */