virtualbox5: prevent null-pointer dereference

Fix #2612
2017-12-18 11:22:03 +01:00 · 2017-12-18 11:22:03 +01:00 · b4e437000a
parent 2f7217b29f
commit b4e437000a
3 changed files with 15 additions and 1 deletions
--- a/repos/ports/ports/virtualbox5.hash
+++ b/repos/ports/ports/virtualbox5.hash
@ -1 +1 @@
-25d9be4a067a1c748bab7a60220d7477e552957a
+585d9e845521cbdc189dbc37f7639b9d3428c125
--- a/repos/ports/src/virtualbox5/patches/series
+++ b/repos/ports/src/virtualbox5/patches/series
@ -10,3 +10,4 @@ tm_tpr_vbox5.patch
 vm.patch
 mm.patch
 substr.patch
+vusburb.patch
--- a/repos/ports/src/virtualbox5/patches/vusburb.patch
+++ b/repos/ports/src/virtualbox5/patches/vusburb.patch
@ -0,0 +1,13 @@
+diff --git a/src/app/virtualbox/src/VBox/Devices/USB/VUSBUrb.cpp b/src/app/virtualbox/src/VBox/Devices/USB/VUSBUrb.cpp
+index 86ed754..250f0ad 100644
+--- a/src/app/virtualbox/src/VBox/Devices/USB/VUSBUrb.cpp
+++ b/src/app/virtualbox/src/VBox/Devices/USB/VUSBUrb.cpp
+@@ -1271,7 +1271,7 @@ void vusbUrbDoReapAsync(PRTLISTANCHOR pUrbLst, RTMSINTERVAL cMillies)
+                    && ((pRipe = pDev->pUsbIns->pReg->pfnUrbReap(pDev->pUsbIns, cMillies)) != NULL))
+             {
+                 vusbUrbAssert(pRipe);
+-                if (pRipe == pVUsbUrbNext->pUrb)
+                if (pVUsbUrbNext && pRipe == pVUsbUrbNext->pUrb)
+                     pVUsbUrbNext = RTListGetNext(pUrbLst, pVUsbUrb, VUSBURBVUSBINT, NdLst);
+                 vusbUrbRipe(pRipe);
+             }