diff options
| author | Sv. Lockal <lockalsash@gmail.com> | 2012-10-07 19:39:47 +0400 |
|---|---|---|
| committer | Sv. Lockal <lockalsash@gmail.com> | 2012-10-07 19:39:47 +0400 |
| commit | c80c4c896aedae7c711d10e6f133d3bdca460de3 (patch) | |
| tree | 0606dc6864d9431fc35287e4296dd05393adc639 | |
| parent | e3ab85a3f589fd6d649caf8fbe71ea70e0a217de (diff) | |
Fix file descriptor leak in BLI_file_ungzip_to_mem and small memleak in wm_window_title.
| -rw-r--r-- | source/blender/blenlib/intern/fileops.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 1df904f617a..883cdfde426 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -140,6 +140,8 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r) } else break; } + + gzclose(gzfile); if (size == 0) { MEM_freeN(mem); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index d0bed4e5965..44827302d7d 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -300,11 +300,9 @@ void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win) void wm_window_title(wmWindowManager *wm, wmWindow *win) { - /* handle the 'temp' window, only set title when not set before */ if (win->screen && win->screen->temp) { - char *title = GHOST_GetTitle(win->ghostwin); - if (title == NULL || title[0] == 0) - GHOST_SetTitle(win->ghostwin, "Blender"); + /* nothing to do for 'temp' windows, + * because WM_window_open_temp always sets window title */ } else { |