bochs-cvs

[Stanislav S. <ssh...@us...>]

Update of /cvsroot/bochs/bochs/cpu
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4310/cpu

Modified Files:
	msr.cc 
Log Message:
Fixed possible mmory bug


Index: msr.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/msr.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- msr.cc	28 Dec 2008 20:30:48 -0000	1.4
+++ msr.cc	29 Dec 2008 19:18:21 -0000	1.5
@@ -194,7 +194,7 @@
 
     default:
 #if BX_CONFIGURE_MSRS
-      if (BX_CPU_THIS_PTR msrs[index]) {
+      if (index < BX_MSR_MAX_INDEX && BX_CPU_THIS_PTR msrs[index]) {
         RAX = GET32L(BX_CPU_THIS_PTR msrs[index]->get64());
         RDX = GET32H(BX_CPU_THIS_PTR msrs[index]->get64());
         break;
@@ -470,7 +470,7 @@
 
     default:
 #if BX_CONFIGURE_MSRS
-      if (BX_CPU_THIS_PTR msrs[index]) {
+      if (index < BX_MSR_MAX_INDEX && BX_CPU_THIS_PTR msrs[index]) {
         if (! BX_CPU_THIS_PTR msrs[index]->set64(val64)) {
           BX_ERROR(("WRMSR: Write failed to MSR %#x - #GP fault", index));
           exception(BX_GP_EXCEPTION, 0, 0);