godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix out of bounds array access on DisplayServerX11 code

Browse Source 
The problem happened on methods `screen_get_position`,
`screen_get_usable_rect` and `window_set_current_screen` when they were
passed a negative screen value.

Fixes:
- #46184
- #46185
- #46186
This commit is contained in:
Pedro Rodrigues 2021-02-28 16:43:46 +00:00
parent 0e77dc6e92
commit 1cb21b6937
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/linuxbsd/display_server_x11.cpp
View File

@ -727,9 +727,9 @@ Point2i DisplayServerX11::screen_get_position(int p_screen) const {
int count; int count;
XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count); XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count);
if (p_screen >= count) {
return Point2i(0, 0); // Check if screen is valid
} ERR_FAIL_INDEX_V(p_screen, count, Point2i(0, 0));
Point2i position = Point2i(xsi[p_screen].x_org, xsi[p_screen].y_org); Point2i position = Point2i(xsi[p_screen].x_org, xsi[p_screen].y_org);
@ -758,9 +758,9 @@ Rect2i DisplayServerX11::screen_get_usable_rect(int p_screen) const {
int count; int count;
XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count); XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count);
if (p_screen >= count) {
return Rect2i(0, 0, 0, 0); // Check if screen is valid
} ERR_FAIL_INDEX_V(p_screen, count, Rect2i(0, 0, 0, 0));
Rect2i rect = Rect2i(xsi[p_screen].x_org, xsi[p_screen].y_org, xsi[p_screen].width, xsi[p_screen].height); Rect2i rect = Rect2i(xsi[p_screen].x_org, xsi[p_screen].y_org, xsi[p_screen].width, xsi[p_screen].height);
XFree(xsi); XFree(xsi);
@ -1041,11 +1041,13 @@ void DisplayServerX11::window_set_current_screen(int p_screen, WindowID p_window
ERR_FAIL_COND(!windows.has(p_window)); ERR_FAIL_COND(!windows.has(p_window));
WindowData &wd = windows[p_window]; WindowData &wd = windows[p_window];
int count = get_screen_count(); if (p_screen == SCREEN_OF_MAIN_WINDOW) {
if (p_screen >= count) { p_screen = window_get_current_screen();
return;
} }
// Check if screen is valid
ERR_FAIL_INDEX(p_screen, get_screen_count());
if (window_get_mode(p_window) == WINDOW_MODE_FULLSCREEN) { if (window_get_mode(p_window) == WINDOW_MODE_FULLSCREEN) {
Point2i position = screen_get_position(p_screen); Point2i position = screen_get_position(p_screen);
Size2i size = screen_get_size(p_screen); Size2i size = screen_get_size(p_screen);