[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-539-g3d603f0

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3d603f00aa4be917fb6e43f2e265de885127f441 (commit)
       via  9794bea6121872eba958d25961bd10c5b901e0ba (commit)
      from  8f2a1314afcae214567e7c686746862127ed0a83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3d603f00aa4be917fb6e43f2e265de885127f441


commit 3d603f00aa4be917fb6e43f2e265de885127f441
Author: Sandro Santilli <address@hidden>
Date:   Fri Apr 8 10:46:25 2011 +0200

    Make sure to destroy movie_root before clearing the MovieFactory (library). 
This prevents MovieLoader (owned by movie_root) adding more items to the 
library, thus keeping SWF loaders alive and keeping Curl busy, with the 
consequence of aborts or segfaults on exit. Fixes bug #32579

diff --git a/gui/Player.cpp b/gui/Player.cpp
index 736fcce..193dc86 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -491,6 +491,9 @@ Player::run(int argc, char* argv[], const std::string& 
infile,
     // Now that we know about movie size, create gui window.
     _gui->createWindow(_url.c_str(), _width, _height, _xPosition, _yPosition);
 
+    { // we construct movie_root in its own scope, to be sure it's destroyed
+      // (bringing down the MovieLoader) before we clear the MovieLibrary
+
     movie_root root(_gui->getClock(), *_runResources);
     
     _callbacksHandler.reset(new CallbacksHandler(*_gui, *this)); 
@@ -644,7 +647,10 @@ Player::run(int argc, char* argv[], const std::string& 
infile,
 
     log_debug("Main loop ended, cleaning up");
 
-    // Clean up as much as possible, so valgrind will help find actual leaks.
+    }
+
+    // Clean up the MovieLibrary so left-over SWFMovieDefinitions
+    // get destroyed and join any loader thread
     MovieFactory::clear();
 
 }

http://git.savannah.gnu.org/cgit//commit/?id=9794bea6121872eba958d25961bd10c5b901e0ba


commit 9794bea6121872eba958d25961bd10c5b901e0ba
Author: Sandro Santilli <address@hidden>
Date:   Fri Apr 8 09:49:01 2011 +0200

    movie_root doesn't need MovieFactory.h

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 7de5e28..3bf80ae 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -46,7 +46,6 @@
 #include "sound_handler.h"
 #include "Timers.h"
 #include "GnashKey.h"
-#include "MovieFactory.h"
 #include "GnashAlgorithm.h"
 #include "GnashNumeric.h"
 #include "Global_as.h"

-----------------------------------------------------------------------

Summary of changes:
 gui/Player.cpp         |    8 +++++++-
 libcore/movie_root.cpp |    1 -
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash