citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #1974 from LittleWhite-tb/crash_invalid_size 

Protection against a resize of size 0
This commit is contained in:
bunnei 2016-07-25 11:35:40 -04:00 committed by GitHub
parent 2117be46a8 7331b79021
commit 682b4af017
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/emu_window.cpp
View File

@ -51,7 +51,6 @@ static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsi
}
std::tuple<unsigned,unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
new_x = std::max(new_x, framebuffer_layout.bottom_screen.left);
new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1);
@ -92,9 +91,9 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
}
EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) {
ASSERT(width > 0);
ASSERT(height > 0);
// When hiding the widget, the function receives a size of 0
if (width == 0) width = 1;
if (height == 0) height = 1;
EmuWindow::FramebufferLayout res = { width, height, {}, {} };