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

Add X11 Atom validity checks.

Browse Source
This commit is contained in:
bruvzg 2020-11-12 15:38:54 +02:00
parent a7d610db16
commit fed776c64c
No known key found for this signature in database
GPG Key ID: FCED35F1CECE0D3A
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
platform/linuxbsd/display_server_x11.cpp
View File

@ -1184,6 +1184,10 @@ bool DisplayServerX11::_window_maximize_check(WindowID p_window, const char *p_a
unsigned char *data = nullptr; unsigned char *data = nullptr;
bool retval = false; bool retval = false;
if (property == None) {
return false;
}
int result = XGetWindowProperty( int result = XGetWindowProperty(
x11_display, x11_display,
wd.x11_window, wd.x11_window,
@ -1448,6 +1452,10 @@ DisplayServer::WindowMode DisplayServerX11::window_get_mode(WindowID p_window) c
{ // Test minimized. { // Test minimized.
// Using ICCCM -- Inter-Client Communication Conventions Manual // Using ICCCM -- Inter-Client Communication Conventions Manual
Atom property = XInternAtom(x11_display, "WM_STATE", True); Atom property = XInternAtom(x11_display, "WM_STATE", True);
if (property == None) {
return WINDOW_MODE_WINDOWED;
}
Atom type; Atom type;
int format; int format;
unsigned long len; unsigned long len;
@ -1943,28 +1951,29 @@ String DisplayServerX11::keyboard_get_layout_name(int p_index) const {
} }
DisplayServerX11::Property DisplayServerX11::_read_property(Display *p_display, Window p_window, Atom p_property) { DisplayServerX11::Property DisplayServerX11::_read_property(Display *p_display, Window p_window, Atom p_property) {
Atom actual_type; Atom actual_type = None;
int actual_format; int actual_format = 0;
unsigned long nitems; unsigned long nitems = 0;
unsigned long bytes_after; unsigned long bytes_after = 0;
unsigned char *ret = nullptr; unsigned char *ret = nullptr;
int read_bytes = 1024; int read_bytes = 1024;
//Keep trying to read the property until there are no // Keep trying to read the property until there are no bytes unread.
//bytes unread. if (p_property != None) {
do { do {
if (ret != nullptr) { if (ret != nullptr) {
XFree(ret); XFree(ret);
} }
XGetWindowProperty(p_display, p_window, p_property, 0, read_bytes, False, AnyPropertyType, XGetWindowProperty(p_display, p_window, p_property, 0, read_bytes, False, AnyPropertyType,
&actual_type, &actual_format, &nitems, &bytes_after, &actual_type, &actual_format, &nitems, &bytes_after,
&ret); &ret);
read_bytes *= 2; read_bytes *= 2;
} while (bytes_after != 0); } while (bytes_after != 0);
}
Property p = { ret, actual_format, (int)nitems, actual_type }; Property p = { ret, actual_format, (int)nitems, actual_type };