From 5bfeafc0377c7576ce570e357d4e056c5fd3d6d4 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 11 Feb 2016 22:09:32 +0100 Subject: [PATCH] PackFramebufferSync_: Check for bad parameters that could cause crash My theory for the #7819 crash --- GPU/GLES/Framebuffer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 8999e513f0..c226449f53 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -1690,6 +1690,12 @@ void FramebufferManager::PackFramebufferSync_(VirtualFramebuffer *vfb, int x, in const int dstBpp = vfb->format == GE_FORMAT_8888 ? 4 : 2; const int packWidth = std::min(vfb->fb_stride, std::min(x + w, (int)vfb->width)); + if (y >= h) { + ERROR_LOG_REPORT_ONCE(vfbfbooutofrange, SCEGE, "PackFramebufferSync_: region out of range (x,y,w,h: %d,%d,%d,%d)", x,y,w,h); + fbo_unbind_read(); + return; + } + if (!convert) { int byteOffset = y * vfb->fb_stride * 4; packed = (GLubyte *)Memory::GetPointer(fb_address + byteOffset);