[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51149] trunk/blender/source/blender: Fix file descriptor leak in BLI_file_ungzip_to_mem and small memleak in wm_window_title .

Sv. Lockal lockalsash at gmail.com
Sun Oct 7 17:39:47 CEST 2012


Revision: 51149
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51149
Author:   lockal
Date:     2012-10-07 15:39:47 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Fix file descriptor leak in BLI_file_ungzip_to_mem and small memleak in wm_window_title.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2012-10-07 14:15:50 UTC (rev 51148)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2012-10-07 15:39:47 UTC (rev 51149)
@@ -140,6 +140,8 @@
 		}
 		else break;
 	}
+	
+	gzclose(gzfile);
 
 	if (size == 0) {
 		MEM_freeN(mem);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2012-10-07 14:15:50 UTC (rev 51148)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2012-10-07 15:39:47 UTC (rev 51149)
@@ -300,11 +300,9 @@
 
 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 {
 		




More information about the Bf-blender-cvs mailing list