Index: /trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h	(revision 71047)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h	(revision 71048)
@@ -963,9 +963,13 @@
             uint8_t const offOpCode = pVCpu->iem.s.offOpcode;
             uint8_t const cbCurrent = pVCpu->iem.s.cbOpcode - pVCpu->iem.s.offOpcode;
-            if (   cbCurrent > 0
-                && cbCurrent < sizeof(pVmcbCtrl->abInstr))
+            if (cbCurrent >= SVM_CTRL_GUEST_INSTR_BYTES_MAX)
             {
-                Assert(cbCurrent <= sizeof(pVCpu->iem.s.abOpcode));
-                memcpy(&pVmcbCtrl->abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], cbCurrent);
+                Assert(cbCurrent <= RT_ELEMENTS(pVCpu->iem.s.abOpcode));
+                memcpy(&pVmcbCtrl->abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], SVM_CTRL_GUEST_INSTR_BYTES_MAX);
+            }
+            else
+            {
+                /** @todo fetch 15 bytes from CS:RIP and stop fetching on exceptions or CS
+                 *        limit is exceeded. */
             }
 #endif