[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58309] trunk/blender/intern/ghost/intern: fix [#36157] Memory Leak in GHOST_DropTargetX11

Campbell Barton ideasman42 at gmail.com
Tue Jul 16 07:10:59 CEST 2013


Revision: 58309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58309
Author:   campbellbarton
Date:     2013-07-16 05:10:58 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
fix [#36157] Memory Leak in GHOST_DropTargetX11
would leak a little bit of memory for every window created.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
    trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h

Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h	2013-07-16 03:41:09 UTC (rev 58308)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h	2013-07-16 05:10:58 UTC (rev 58309)
@@ -152,6 +152,10 @@
 	GHOST_SystemWin32 *m_system;
 	/* Data type of the dragged object */
 	GHOST_TDragnDropTypes m_draggedObjectType;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetWin32")
+#endif
 };
 
 #endif  // __GHOST_DROPTARGETWIN32_H__

Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp	2013-07-16 03:41:09 UTC (rev 58308)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp	2013-07-16 05:10:58 UTC (rev 58309)
@@ -84,6 +84,9 @@
 void GHOST_DropTargetX11::Uninitialize(void)
 {
 	xdnd_shut(&m_dndClass);
+
+	delete[] m_dndActions;
+	delete[] m_dndTypes;
 }
 
 GHOST_DropTargetX11::GHOST_DropTargetX11(GHOST_WindowX11 *window, GHOST_SystemX11 *system)

Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h	2013-07-16 03:41:09 UTC (rev 58308)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.h	2013-07-16 05:10:58 UTC (rev 58309)
@@ -130,6 +130,10 @@
 
 	/* counter of references to global XDND structures */
 	static int m_refCounter;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetX11")
+#endif
 };
 
 #endif  // __GHOST_DROPTARGETX11_H__




More information about the Bf-blender-cvs mailing list