aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authornotaz2011-06-06 18:48:41 +0300
committernotaz2011-06-06 18:48:41 +0300
commita48ae3a7decaae1f0bbc45fb0ce37e030fd5357b (patch)
tree0da1e23462debf8bd486792ceea830de23b20d2f /libpcsxcore
parent4218954fcca1237c29f0ba071a4e62d80542cd7e (diff)
downloadpcsx_rearmed-a48ae3a7decaae1f0bbc45fb0ce37e030fd5357b.tar.gz
pcsx_rearmed-a48ae3a7decaae1f0bbc45fb0ce37e030fd5357b.tar.bz2
pcsx_rearmed-a48ae3a7decaae1f0bbc45fb0ce37e030fd5357b.zip
cdrom: do a NULL check, some plugins may return that
Diffstat (limited to 'libpcsxcore')
-rw-r--r--libpcsxcore/cdrom.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 142c1e2..c82b6da 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1216,7 +1216,8 @@ void cdrInterrupt() {
// - fixes cutscene speech
{
u8 *buf = CDR_getBuffer();
- memcpy(cdr.Transfer, buf, 8);
+ if (buf != NULL)
+ memcpy(cdr.Transfer, buf, 8);
}