vbox的更動 12143 路徑 trunk/src/VBox/Devices/Storage

時間撮記:

2008-9-5 下午03:57:39 (16 年 以前)

作者:

vboxsync

訊息:

disk: ixed a bunch of NULL pointer accesses

位置:

trunk/src/VBox/Devices/Storage

檔案:

• RawHDDCore.cpp (修改) (1 筆差異)
• VBoxHDD-new.cpp (修改) (7 筆差異)
• VDIHDDCore.cpp (修改) (1 筆差異)
• VHDHDDCore.cpp (修改) (1 筆差異)

trunk/src/VBox/Devices/Storage/RawHDDCore.cpp

@@ -396 +396 @@
     {
         pCbProgress = VDGetInterfaceProgress(pIfProgress);
-        pfnProgress = pCbProgress->pfnProgress;
+        if (pCbProgress)
+            pfnProgress = pCbProgress->pfnProgress;
         pvUser = pIfProgress->pvUser;
     }

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -1506 +1506 @@
     }
 
-    if (RT_SUCCESS(rc) && pCbProgress->pfnProgress)
+    if (RT_SUCCESS(rc) && pCbProgress && pCbProgress->pfnProgress)
         pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */, 100,
                                  pIfProgress->pvUser);
@@ -1701 +1701 @@
     }
 
-    if (RT_SUCCESS(rc) && pCbProgress->pfnProgress)
+    if (RT_SUCCESS(rc) && pCbProgress && pCbProgress->pfnProgress)
         pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */, 100,
                                  pIfProgress->pvUser);
@@ -1827 +1827 @@
                 cbRemaining -= cbThisRead;
 
-                if (pCbProgress->pfnProgress)
+                if (pCbProgress && pCbProgress->pfnProgress)
                 {
                     rc = pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */,
@@ -1876 +1876 @@
                 cbRemaining -= cbThisRead;
 
-                if (pCbProgress->pfnProgress)
+                if (pCbProgress && pCbProgress->pfnProgress)
                 {
                     rc = pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */,
@@ -1944 +1944 @@
         RTMemTmpFree(pvBuf);
 
-    if (RT_SUCCESS(rc) && pCbProgress->pfnProgress)
+    if (RT_SUCCESS(rc) && pCbProgress && pCbProgress->pfnProgress)
         pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */, 100,
                                  pIfProgress->pvUser);
@@ -2148 +2148 @@
             cbRemaining -= cbThisRead;
 
-            if (pCbProgress->pfnProgress)
+            if (pCbProgress && pCbProgress->pfnProgress)
             {
                 rc = pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */,
@@ -2213 +2213 @@
     if (RT_SUCCESS(rc))
     {
-        if (pCbProgress->pfnProgress)
+        if (pCbProgress && pCbProgress->pfnProgress)
             pCbProgress->pfnProgress(NULL /* WARNING! pVM=NULL */, 100,
                                      pIfProgress->pvUser);

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -834 +834 @@
     {
         pCbProgress = VDGetInterfaceProgress(pIfProgress);
-        pfnProgress = pCbProgress->pfnProgress;
+        if (pCbProgress)
+            pfnProgress = pCbProgress->pfnProgress;
         pvUser = pIfProgress->pvUser;
     }

trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp

@@ -1600 +1600 @@
     {
         pCbProgress = VDGetInterfaceProgress(pIfProgress);
-        pfnProgress = pCbProgress->pfnProgress;
+        if (pCbProgress)
+            pfnProgress = pCbProgress->pfnProgress;
         pvUser = pIfProgress->pvUser;
     }