fix some memory access errors

Author: ValleyBell

emu/cores/vsu.h

@@ -4,7 +4,7 @@
 #include "../EmuStructs.h"
 
 
-#define OPT_VST_WRAM_WRT_WHILE_ON	0x0001	// allow writes to waveRAM while sound is on (buggy emulation)
+#define OPT_VSU_WRAM_WRT_WHILE_ON	0x0001	// allow writes to waveRAM while sound is on (buggy emulation)
 
 
 extern const DEV_DECL sndDev_VBoyVSU;

player/dblk_compr.c

@@ -729,6 +729,9 @@ void ReadPCMComprTable(UINT32 dataSize, const UINT8* data, PCM_COMPR_TBL* comprT
 	UINT8 valSize;
 	UINT32 tblSize;
 
+	if (dataSize < 0x06)
+		return;	// don't try to access elements when there is no data
+	
 	comprTbl->comprType = data[0x00];
 	comprTbl->cmpSubType = data[0x01];
 	comprTbl->bitsDec = data[0x02];

player/vgmplayer_cmdhandler.cpp

@@ -724,6 +724,8 @@ void VGMPlayer::Cmd_DataBlock(void)
 
 			pcmBnk->bankOfs.push_back(oldLen);
 			pcmBnk->bankSize.push_back(dataLen);
+			if (!dataLen)
+				return;	// don't try to access std::vector elements when there is no data
 
 			pcmBnk->data.resize(oldLen + dataLen);
 			if (dblkType & 0x40)
@@ -751,6 +753,8 @@ void VGMPlayer::Cmd_DataBlock(void)
 		if (cDev == NULL)
 			break;
 
+		if (dblkLen < 0x08)
+			return;
 		memSize = ReadLE32(&fData[0x00]);
 		dataOfs = ReadLE32(&fData[0x04]);
 		dataPtr = &fData[0x08];
@@ -780,13 +784,17 @@ void VGMPlayer::Cmd_DataBlock(void)
 
 		if (! (dblkType & 0x20))
 		{
+			if (dblkLen < 0x02)
+				return;
 			// C0..DF: 16-bit addressing
 			dataOfs = ReadLE16(&fData[0x00]);
 			dataLen = dblkLen - 0x02;
 			dataPtr = &fData[0x02];
 		}
 		else
 		{
+			if (dblkLen < 0x04)
+				return;
 			// E0..FF: 32-bit addressing
 			dataOfs = ReadLE32(&fData[0x00]);
 			dataLen = dblkLen - 0x04;