KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11: Handle invalid data being sent with drag events by some applications

Browse Source 
Fixes #2505
This commit is contained in:
Kovid Goyal 2020-04-02 21:01:19 +05:30
parent 5aead5eebe
commit 759a15ccbb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glfw/x11_window.c vendored
View File

@ -1075,6 +1075,21 @@ static void onConfigChange(void)
} }
} }
static void
get_atom_names(Atom *atoms, int count, char **atom_names) {
_glfwGrabErrorHandlerX11();
XGetAtomNames(_glfw.x11.display, atoms, count, atom_names);
_glfwReleaseErrorHandlerX11();
if (_glfw.x11.errorCode != Success) {
for (int i = 0; i < count; i++) {
_glfwGrabErrorHandlerX11();
atom_names[i] = XGetAtomName(_glfw.x11.display, atoms[i]);
_glfwReleaseErrorHandlerX11();
if (_glfw.x11.errorCode != Success) atom_names[i] = NULL;
}
}
}
// Process the specified X event // Process the specified X event
// //
static void processEvent(XEvent *event) static void processEvent(XEvent *event)
@ -1474,7 +1489,7 @@ static void processEvent(XEvent *event)
} }
char **atom_names = calloc(count, sizeof(char**)); char **atom_names = calloc(count, sizeof(char**));
if (atom_names) { if (atom_names) {
XGetAtomNames(_glfw.x11.display, formats, count, atom_names); get_atom_names(formats, count, atom_names);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {