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

Added null check to prevent crashing on paste.

Browse Source 
Should look into why XGetWindowProperty isnt working also.
This commit is contained in:
Campbell Barton 2008-03-18 16:12:43 +00:00
parent f47aec78c9
commit c8813776c4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,10 +990,12 @@ getClipboard(int flag
XNextEvent(m_display, &xevent);
if(xevent.type == SelectionNotify) {
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));
strcpy((char*)tmp_data, (char*)data);
XFree(data);
return (GHOST_TUns8*)tmp_data;
if (data) {
tmp_data = (unsigned char*) malloc(strlen((char*)data));
strcpy((char*)tmp_data, (char*)data);
XFree(data);
return (GHOST_TUns8*)tmp_data;
}
}
return NULL;
}