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

X11: Fix a crash when listing clipboard MIME types and the clipboard is owned by self

Browse Source 
Fixes #5920
This commit is contained in:
Kovid Goyal 2023-01-22 21:19:03 +05:30
parent 7a526d9588
commit a4075ff041
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glfw/x11_window.c vendored
View File

@ -2897,17 +2897,20 @@ void _glfwPlatformSetClipboard(GLFWClipboardType t) {
typedef struct chunked_writer { typedef struct chunked_writer {
char *buf; size_t sz, cap; char *buf; size_t sz, cap;
bool is_self_offer;
} chunked_writer; } chunked_writer;
static bool static bool
write_chunk(void *object, const char *data, size_t sz) { write_chunk(void *object, const char *data, size_t sz) {
chunked_writer *cw = object; chunked_writer *cw = object;
if (data) {
if (cw->cap < cw->sz + sz) { if (cw->cap < cw->sz + sz) {
cw->cap = MAX(cw->cap * 2, cw->sz + 8*sz); cw->cap = MAX(cw->cap * 2, cw->sz + 8*sz);
cw->buf = realloc(cw->buf, cw->cap * sizeof(cw->buf[0])); cw->buf = realloc(cw->buf, cw->cap * sizeof(cw->buf[0]));
} }
memcpy(cw->buf + cw->sz, data, sz); memcpy(cw->buf + cw->sz, data, sz);
cw->sz += sz; cw->sz += sz;
} else if (sz == 1) cw->is_self_offer = true;
return true; return true;
} }
@ -2915,6 +2918,10 @@ static void
get_available_mime_types(Atom which_clipboard, GLFWclipboardwritedatafun write_data, void *object) { get_available_mime_types(Atom which_clipboard, GLFWclipboardwritedatafun write_data, void *object) {
chunked_writer cw = {0}; chunked_writer cw = {0};
getSelectionString(which_clipboard, &_glfw.x11.TARGETS, 1, write_chunk, &cw, false); getSelectionString(which_clipboard, &_glfw.x11.TARGETS, 1, write_chunk, &cw, false);
if (cw.is_self_offer) {
write_data(object, NULL, 1);
return;
}
size_t count = 0; size_t count = 0;
bool ok = true; bool ok = true;
if (cw.buf) { if (cw.buf) {