asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #46519 from pdfrod/v3.2/fix-out-of-bounds-acess-on-x11

Browse source 
Fix out of bounds array access on OS_X11 code
This commit is contained in:
Rémi Verschelde 2021-02-28 21:44:49 +01:00 • committed by GitHub
commit 5c23fc4a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
platform/x11/os_x11.cpp
View file

@ -1171,8 +1171,12 @@ int OS_X11::get_current_screen() const {
} }
void OS_X11::set_current_screen(int p_screen) { void OS_X11::set_current_screen(int p_screen) {
int count = get_screen_count(); if (p_screen == -1) {
if (p_screen >= count) return; p_screen = get_current_screen();
}
// Check if screen is valid
ERR_FAIL_INDEX(p_screen, get_screen_count());
if (current_videomode.fullscreen) { if (current_videomode.fullscreen) {
Point2i position = get_screen_position(p_screen); Point2i position = get_screen_position(p_screen);
@ -1201,9 +1205,9 @@ Point2 OS_X11::get_screen_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);
@ -1224,7 +1228,9 @@ Size2 OS_X11::get_screen_size(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 Size2i(0, 0);
// Check if screen is valid
ERR_FAIL_INDEX_V(p_screen, count, Size2i(0, 0));
Size2i size = Point2i(xsi[p_screen].width, xsi[p_screen].height); Size2i size = Point2i(xsi[p_screen].width, xsi[p_screen].height);
XFree(xsi); XFree(xsi);