[Qemu-devel] [PATCH 3/3] cris: fix a segfault if pflash drive not found

[Mark McLoughlin]

drive_get_index() returns -1 if a drive isn't found; don't
use -1 to index drives_table.

Signed-off-by: Mark McLoughlin <address@hidden>
---
 hw/etraxfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 4f93cd8..2f6e2ee 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -83,7 +83,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     phys_flash = qemu_ram_alloc(FLASH_SIZE);
     i = drive_get_index(IF_PFLASH, 0, 0);
     pflash_cfi02_register(0x0, phys_flash,
-                          drives_table[i].bdrv, (64 * 1024),
+                          i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024),
                           FLASH_SIZE >> 16,
                           1, 2, 0x0000, 0x0000, 0x0000, 0x0000,
                           0x555, 0x2aa);
-- 
1.5.4.3