[mupen64plus-core] 01/03: Don't try to access uninitialized blocks[x] in dma_pi_write

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch experimental-dynarec
in repository mupen64plus-core.

commit f4b86582de0444bb53bf41a2949a49522f28964b
Author: Emil Langrock <emil.langrock at gmx.de>
Date:   Sat Mar 12 13:59:39 2011 +0100

    Don't try to access uninitialized blocks[x] in dma_pi_write
---
 src/memory/dma.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/memory/dma.c b/src/memory/dma.c
index 6303316..ba1e3da 100644
--- a/src/memory/dma.c
+++ b/src/memory/dma.c
@@ -211,7 +211,8 @@ void dma_pi_write(void)
 
             if (!invalid_code[rdram_address1>>12])
             {
-                if (blocks[rdram_address1>>12]->block[(rdram_address1&0xFFF)/4].ops !=
+                if (!blocks[rdram_address1>>12] ||
+                    blocks[rdram_address1>>12]->block[(rdram_address1&0xFFF)/4].ops !=
                     current_instruction_table.NOTCOMPILED)
                 {
                     invalid_code[rdram_address1>>12] = 1;
@@ -219,7 +220,8 @@ void dma_pi_write(void)
             }
             if (!invalid_code[rdram_address2>>12])
             {
-                if (blocks[rdram_address2>>12]->block[(rdram_address2&0xFFF)/4].ops !=
+                if (!blocks[rdram_address1>>12] ||
+                    blocks[rdram_address2>>12]->block[(rdram_address2&0xFFF)/4].ops !=
                     current_instruction_table.NOTCOMPILED)
                 {
                     invalid_code[rdram_address2>>12] = 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git