m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11 : fix crash in Handle_SelectionNotify() when Clipboard cannot be converted to UTF8_STRING

Browse Source
This commit is contained in:
Thomas Bernard 2018-12-29 15:57:27 +01:00
parent 75210cfe7c
commit a68343d2ad
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/input.c
View File

@ -478,15 +478,26 @@ static int Handle_SelectionNotify(const XSelectionEvent* xselection)
unsigned long count = 0, bytesAfter = 0; unsigned long count = 0, bytesAfter = 0;
unsigned char * value = NULL; unsigned char * value = NULL;
r = XGetWindowProperty(X11_display, X11_window, xselection->property, 0, LONG_MAX, GFX2_Log(GFX2_DEBUG, "xselection: selection=%s property=%s target=%s\n",
False, xselection->target /* type */, &type, &format, XGetAtomName(X11_display, xselection->selection),
&count, &bytesAfter, &value); xselection->property == None ? "None" : XGetAtomName(X11_display, xselection->property),
if (r == Success && value != NULL) XGetAtomName(X11_display, xselection->target));
if (xselection->property != None)
{ {
X11_clipboard = strdup((char *)value); r = XGetWindowProperty(X11_display, X11_window, xselection->property, 0, LONG_MAX,
XFree(value); False, xselection->target /* type */, &type, &format,
&count, &bytesAfter, &value);
if (r == Success && value != NULL)
{
X11_clipboard = strdup((char *)value);
XFree(value);
}
user_feedback_required = 1;
}
else
{
GFX2_Log(GFX2_INFO, "X11 Selection conversion failed\n");
} }
user_feedback_required = 1;
} }
else else
{ {