From: Twinaphex <libretro@gmail.com>
Date: Sat, 8 Feb 2020 15:24:22 +0000 (+0100)
Subject: Merge pull request #377 from pcercuei/libretro
X-Git-Tag: r24l~682
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0adc619b5a5705d16cc6caea64951776ababbb96;hp=6f1edc3c7fd1f7f58155107d0c99d0ac7d22443b;p=pcsx_rearmed.git

Merge pull request #377 from pcercuei/libretro

Lightrec dynarec
---

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index a65ca545..a417a528 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1499,7 +1499,9 @@ int cdrFreeze(void *f, int Mode) {
 		pTransfer = cdr.Transfer + tmp;
 
 		// read right sub data
-		memcpy(tmpp, cdr.Prev, 3);
+		tmpp[0] = btoi(cdr.Prev[0]);
+		tmpp[1] = btoi(cdr.Prev[1]);
+		tmpp[2] = btoi(cdr.Prev[2]);
 		cdr.Prev[0]++;
 		ReadTrack(tmpp);
 
diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c
index 17386b40..007da65f 100644
--- a/plugins/gpulib/gpu.c
+++ b/plugins/gpulib/gpu.c
@@ -528,6 +528,12 @@ static noinline int do_cmd_buffer(uint32_t *data, int count)
 
     cmd = data[pos] >> 24;
     if (0xa0 <= cmd && cmd <= 0xdf) {
+      if (unlikely((pos+2) >= count)) {
+        // incomplete vram write/read cmd, can't consume yet
+        cmd = -1;
+        break;
+      }
+
       // consume vram write/read cmd
       start_vram_transfer(data[pos + 1], data[pos + 2], (cmd & 0xe0) == 0xc0);
       pos += 3;