kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#17850] Copying text from Eric4 to Blender crashes Blender

Browse Source 
The crash is caused by calling XGetWindowProperty when xevent.xselection.property is zero.
Not a proper fix because clipboard can paste the data without trouble.
This commit is contained in:
Campbell Barton 2009-01-27 08:17:35 +00:00
parent 9146687ffc
commit d95d110d8d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -1031,15 +1031,20 @@ getClipboard(int flag
//This needs to change so we do not wait for ever or check owner first //This needs to change so we do not wait for ever or check owner first
while(1) { while(1) {
XNextEvent(m_display, &xevent); XNextEvent(m_display, &xevent);
if(xevent.type == SelectionNotify) { if(xevent.type == SelectionNotify) {
if(XGetWindowProperty(m_display, m_window, xevent.xselection.property, 0L, 4096L, False, AnyPropertyType, &rtype, &bits, &len, &bytes, &data) == Success) { if (xevent.xselection.property ) { /* eric4 on linux gives zero Atom xevent.xselection.property value, closes blender instantly */
if (data) { if(XGetWindowProperty(m_display, m_window, xevent.xselection.property , 0L, 4096L, False, AnyPropertyType, &rtype, &bits, &len, &bytes, &data) == Success) {
tmp_data = (unsigned char*) malloc(strlen((char*)data)+1); if (data) {
strcpy((char*)tmp_data, (char*)data); tmp_data = (unsigned char*) malloc(strlen((char*)data)+1);
XFree(data); strcpy((char*)tmp_data, (char*)data);
return (GHOST_TUns8*)tmp_data; XFree(data);
return (GHOST_TUns8*)tmp_data;
}
} }
} }
else {
fprintf(stderr, "error: cut buffer had a zero xevent.xselection.property, FIXME\n"); // XXX fix this problem!
}
return NULL; return NULL;
} }
} }