[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60028] trunk/blender/intern/ghost/test: fix double free in ghost c++ gears test program.
Campbell Barton
ideasman42 at gmail.com
Wed Sep 11 03:15:16 CEST 2013
Revision: 60028
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60028
Author: campbellbarton
Date: 2013-09-11 01:15:13 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
fix double free in ghost c++ gears test program.
Modified Paths:
--------------
trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp
trunk/blender/intern/ghost/test/multitest/MultiTest.c
Modified: trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp
===================================================================
--- trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp 2013-09-10 23:11:58 UTC (rev 60027)
+++ trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp 2013-09-11 01:15:13 UTC (rev 60028)
@@ -715,13 +715,16 @@
// Add the application as event consumer
fSystem->addEventConsumer(&app);
-
+
// Enter main loop
while (!app.m_exitRequested) {
//printf("main: loop\n");
fSystem->processEvents(true);
fSystem->dispatchEvents();
}
+
+ // Remove so ghost doesn't do a double free
+ fSystem->removeEventConsumer(&app);
}
// Dispose the system
Modified: trunk/blender/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/MultiTest.c 2013-09-10 23:11:58 UTC (rev 60027)
+++ trunk/blender/intern/ghost/test/multitest/MultiTest.c 2013-09-11 01:15:13 UTC (rev 60028)
@@ -931,11 +931,13 @@
int main(int argc, char **argv)
{
+ MultiTestApp *app;
+
#ifndef USE_BMF
BLF_init(11, 72);
#endif
- MultiTestApp *app = multitestapp_new();
+ app = multitestapp_new();
multitestapp_run(app);
multitestapp_free(app);
More information about the Bf-blender-cvs
mailing list