From 1d021a72c7a1245adeceecd706dbebfb739f6247 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 30 May 2016 15:08:42 -0700 Subject: [PATCH] GB Memory: Fix null deref when rumbling --- src/gb/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gb/memory.c b/src/gb/memory.c index d42e4c682..df08311ec 100644 --- a/src/gb/memory.c +++ b/src/gb/memory.c @@ -721,7 +721,7 @@ void _GBMBC5(struct GBMemory* memory, uint16_t address, uint8_t value) { break; case 0x4: case 0x5: - if (memory->mbcType == GB_MBC5_RUMBLE) { + if (memory->mbcType == GB_MBC5_RUMBLE && memory->rumble) { memory->rumble->setRumble(memory->rumble, (value >> 3) & 1); value &= ~8; }