diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-05-18 23:47:04 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-18 23:47:04 +0400 |
| commit | 96348bc772eb7ac2cb8b6114c2d345386585ae74 (patch) | |
| tree | 6fa1a7adb4c233ab297cb344d258d123d11a3a2e /source/blender/editors/interface/interface_handlers.c | |
| parent | 4022380dc6a70b5123282e912743e568a92adde2 (diff) | |
Commit revision 20062 and 20109 from trunk, also fix a small memory
error on interface, was try to free an incorrect pointer.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 02c803963eb..c38f147a480 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -651,7 +651,8 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, if(mode=='v') { /* extract first line from clipboard in case of multi-line copies */ - char *p = WM_clipboard_text_get(0); + char *p, *pbuf= WM_clipboard_text_get(0); + p= pbuf; if(p) { int i = 0; while (*p && *p!='\r' && *p!='\n' && i<UI_MAX_DRAW_STR) { @@ -659,7 +660,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, p++; } buf[i]= 0; - MEM_freeN(p); + MEM_freeN(pbuf); } } |