Changeset 76785 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jan 11, 2019 5:35:01 PM (6 years ago)

Author:

vboxsync

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

128117

Message:

Fix for bugref:9328

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -1572 +1572 @@
             if (RT_SUCCESS(rc))
             {
-                PSUPDRVNTERRORINFO  pCur;
+                PSUPDRVNTERRORINFO pMatch = NULL;
+                PSUPDRVNTERRORINFO pCur;
                 RTListForEach(&g_ErrorInfoHead, pCur, SUPDRVNTERRORINFO, ListEntry)
                 {
                     if (   pCur->hProcessId == hCurProcessId
                         && pCur->hThreadId  == hCurThreadId)
+                    {
+                        pMatch = pCur;
                         break;
+                    }
                 }
 
@@ -1584 +1588 @@
                  * If so, check the destination buffer and copy the data into it.
                  */
-                if (   pCur
-                    && pStack->Parameters.Read.ByteOffset.QuadPart < pCur->cchErrorInfo
+                if (   pMatch
+                    && pStack->Parameters.Read.ByteOffset.QuadPart < pMatch->cchErrorInfo
                     && pStack->Parameters.Read.ByteOffset.QuadPart >= 0)
                 {
@@ -1592 +1596 @@
                     {
                         uint32_t offRead  = (uint32_t)pStack->Parameters.Read.ByteOffset.QuadPart;
-                        uint32_t cbToRead = pCur->cchErrorInfo - offRead;
+                        uint32_t cbToRead = pMatch->cchErrorInfo - offRead;
                         if (cbToRead < pStack->Parameters.Read.Length)
                             RT_BZERO((uint8_t *)pvDstBuf + cbToRead, pStack->Parameters.Read.Length - cbToRead);
                         else
                             cbToRead = pStack->Parameters.Read.Length;
-                        memcpy(pvDstBuf, &pCur->szErrorInfo[offRead], cbToRead);
+                        memcpy(pvDstBuf, &pMatch->szErrorInfo[offRead], cbToRead);
                         pIrp->IoStatus.Information = cbToRead;
 
@@ -1608 +1612 @@
                  * End of file. Free the info.
                  */
-                else if (pCur)
+                else if (pMatch)
                 {
-                    RTListNodeRemove(&pCur->ListEntry);
-                    RTMemFree(pCur);
+                    RTListNodeRemove(&pMatch->ListEntry);
+                    RTMemFree(pMatch);
                     rcNt = STATUS_END_OF_FILE;
                 }