Changeset 72953 in vbox

Timestamp:

Jul 7, 2018 6:20:59 PM (7 years ago)

Author:

vboxsync

Message:

Runtime: Proper error handling (bugref:9188)

File:

• trunk/src/VBox/Runtime/r3/isofs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/isofs.cpp

@@ -172 +172 @@
     while ((cbLeft > 0) && RT_SUCCESS(rc))
     {
+        AssertReturn(cbLeft >= sizeof(RTISOFSPATHTABLEHEADER), VERR_INVALID_PARAMETER);
         size_t cbRead;
         rc = RTFileRead(pFile->file, (RTISOFSPATHTABLEHEADER*)&header, sizeof(RTISOFSPATHTABLEHEADER), &cbRead);
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(rc) || cbRead == 0)
             break;
         cbLeft -= cbRead;
         if (header.length)
         {
-            Assert(cbLeft >= header.length);
-            Assert(header.length <= 31);
+            AssertReturn(cbLeft >= header.length, VERR_INVALID_PARAMETER);
+            AssertReturn(header.length <= 31, VERR_INVALID_PARAMETER);
             /* Allocate and read in the actual path name. */
             char *pszName = RTStrAlloc(header.length + 1);
@@ -201 +202 @@
     }
 
-    /* Transform path names into full paths. This is a bit ugly right now. */
-    PRTISOFSPATHTABLEENTRY pNode = RTListGetLast(&pFile->listPaths, RTISOFSPATHTABLEENTRY, Node);
-    while (   pNode
-           && !RTListNodeIsFirst(&pFile->listPaths, &pNode->Node)
-           && RT_SUCCESS(rc))
-    {
-        rc = rtIsoFsGetParentPathSub(&pFile->listPaths, pNode,
-                                     pNode->path, &pNode->path_full);
-        if (RT_SUCCESS(rc))
-            pNode = RTListNodeGetPrev(&pNode->Node, RTISOFSPATHTABLEENTRY, Node);
+    if (RT_SUCCESS(rc))
+    {
+        /* Transform path names into full paths. This is a bit ugly right now. */
+        PRTISOFSPATHTABLEENTRY pNode = RTListGetLast(&pFile->listPaths, RTISOFSPATHTABLEENTRY, Node);
+        while (   pNode
+               && !RTListNodeIsFirst(&pFile->listPaths, &pNode->Node)
+               && RT_SUCCESS(rc))
+        {
+            rc = rtIsoFsGetParentPathSub(&pFile->listPaths, pNode,
+                                         pNode->path, &pNode->path_full);
+            if (RT_SUCCESS(rc))
+                pNode = RTListNodeGetPrev(&pNode->Node, RTISOFSPATHTABLEENTRY, Node);
+        }
     }