mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix STR #2647: crash when copying text from firefox under X11.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8764 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-05-30 16:47:48 +00:00
parent 2e397fcd81
commit 1bef30d503
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Fl_x.cxx
View File

@ -945,7 +945,7 @@ int fl_handle(const XEvent& thisevent)
// bugs in X servers, or maybe to avoid an extra round-trip to
// get the property length. I copy this here:
Atom actual; int format; unsigned long count, remaining;
unsigned char* portion;
unsigned char* portion = NULL;
if (XGetWindowProperty(fl_display,
fl_xevent->xselection.requestor,
fl_xevent->xselection.property,
@ -971,18 +971,17 @@ int fl_handle(const XEvent& thisevent)
fl_event_time);
return true;
}
XTextProperty text_prop;
text_prop.value=portion;
text_prop.format=format;
text_prop.encoding=actual;
text_prop.nitems=count;
char **text_list;
text_list = (char**)&portion;
int bytesnew = strlen(*text_list)+1;
buffer = (unsigned char*)realloc(buffer, bytesread+bytesnew+remaining);
memcpy(buffer+bytesread, *text_list, bytesnew);
// Make sure we got something sane...
if ((portion == NULL) || (format != 8) || (count == 0)) {
if (portion) XFree(portion);
return true;
}
buffer = (unsigned char*)realloc(buffer, bytesread+count+remaining+1);
memcpy(buffer+bytesread, portion, count);
XFree(portion);
bytesread += bytesnew - 1;
bytesread += count;
// Cannot trust data to be null terminated
buffer[bytesread] = '\0';
if (!remaining) break;
}
if (buffer) {