Changeset 64260 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Oct 13, 2016 3:54:01 PM (8 years ago)

Author:

vboxsync

Message:

supdrvGipDetectGetGipCpuCallback: paranoia, pGipCpu could be NULL.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -307 +307 @@
                     && (ASMCpuId_EDX(UINT32_C(0x80000001)) & X86_CPUID_EXT_FEATURE_EDX_RDTSCP) )
                 {
-                    uint32_t const  uGroupedAux = (uint8_t)pGipCpu->iCpuGroupMember | ((uint32_t)pGipCpu->iCpuGroup << 8);
                     uint32_t        uAux;
                     ASMReadTscWithAux(&uAux);
@@ -318 +317 @@
                     }
 
-                    if (   (uAux & UINT16_MAX) == uGroupedAux
-                        && pGipCpu->iCpuGroupMember <= UINT8_MAX)
+                    if (pGipCpu)
                     {
-                        ASMNopPause();
-                        ASMReadTscWithAux(&uAux);
-                        if ((uAux & UINT16_MAX) == uGroupedAux)
-                            fSupported |= SUPGIPGETCPU_RDTSCP_GROUP_IN_CH_NUMBER_IN_CL;
+                        uint32_t const  uGroupedAux = (uint8_t)pGipCpu->iCpuGroupMember | ((uint32_t)pGipCpu->iCpuGroup << 8);
+                        if (   (uAux & UINT16_MAX) == uGroupedAux
+                            && pGipCpu->iCpuGroupMember <= UINT8_MAX)
+                        {
+                            ASMNopPause();
+                            ASMReadTscWithAux(&uAux);
+                            if ((uAux & UINT16_MAX) == uGroupedAux)
+                                fSupported |= SUPGIPGETCPU_RDTSCP_GROUP_IN_CH_NUMBER_IN_CL;
+                        }
                     }
                 }