Ticket #846: CJSObject_memleak_fixes.patch

source/graphics/GameView.cpp

@@ -205 +205 @@
     {
     }
 
+    ~CGameViewImpl();
+
     CGame* Game;
     CColladaManager ColladaManager;
     CMeshManager MeshManager;
@@ -412 +414 @@
     CJSObject<CGameViewImpl>::ScriptingInit("GameView");
 }
 
+CGameViewImpl::~CGameViewImpl()
+{
+    CJSObject<CGameViewImpl>::ScriptingShutdown();
+}
+
 int CGameView::Initialize()
 {
     CFG_GET_VAL("view.scroll.speed", Float, m->ViewScrollSpeed);

source/renderer/Renderer.cpp

@@ -501 +501 @@
 {
     UnregisterFileReloadFunc(ReloadChangedFileCB, this);
 
+    CJSObject<CRenderer>::ScriptingShutdown();
+
     // we no longer UnloadAlphaMaps / UnloadWaterTextures here -
     // that is the responsibility of the module that asked for
     // them to be loaded (i.e. CGameView).

source/scripting/ScriptableObject.h

@@ -249 +249 @@
         g_ScriptingHost.DefineCustomObjectType( &JSI_class, Constructor, ConstructorMinArgs, JSI_props, JSI_methods, NULL, NULL );
 
         delete[]( JSI_methods );
-
-        atexit( ScriptingShutdown );
     }
     static void ScriptingShutdown()
     {

source/soundmanager/js/AmbientSound.cpp

@@ -32 +32 @@
 {
 }
 
+JAmbientSound::~JAmbientSound()
+{
+    CJSObject<JAmbientSound>::ScriptingShutdown();
+}
+
 // start playing the sound, all ambient sounds loop
 bool JAmbientSound::Play(JSContext* UNUSED(cx), uintN UNUSED(argc), jsval* UNUSED(argv))
 {

source/soundmanager/js/AmbientSound.h

@@ -25 +25 @@
 {
 public: 
     JAmbientSound(const VfsPath& pathname);
+    ~JAmbientSound();
     
     CStr ToString(JSContext* cx, uintN argc, jsval* argv);
     

source/soundmanager/js/MusicList.cpp

@@ -38 +38 @@
 #endif
 }
 
+JMusicList::~JMusicList()
+{
+    CJSObject<JMusicList>::ScriptingShutdown();
+}
+
 bool JMusicList::AddItem(JSContext* cx, uintN UNUSED(argc), jsval* vp)
 { 
   CStrW filename;

source/soundmanager/js/MusicList.h

@@ -39 +39 @@
 {
 public: 
   JMusicList();
+  ~JMusicList();
 
   // Script-bound functions
 

source/soundmanager/js/MusicSound.cpp

@@ -33 +33 @@
 {
 }
 
+JMusicSound::~JMusicSound()
+{
+    CJSObject<JMusicSound>::ScriptingShutdown();
+}
+
 bool JMusicSound::Play(JSContext* UNUSED(cx), uintN UNUSED(argc), jsval* UNUSED(argv))
 {
 #if CONFIG2_AUDIO

source/soundmanager/js/MusicSound.h

@@ -39 +39 @@
 {
 public: 
     JMusicSound(const VfsPath& pathname);
+    ~JMusicSound();
     
     // Script-bound functions
     

source/soundmanager/js/Sound.cpp

@@ -46 +46 @@
         m_SndItem = 0;
     }
 #endif // CONFIG2_AUDIO
+
+    CJSObject<JSound>::ScriptingShutdown();
 }
 
 bool JSound::ClearSoundItem()

source/soundmanager/js/SoundPlayer.cpp

@@ -33 +33 @@
 
 JSoundPlayer::~JSoundPlayer()
 {
+    CJSObject<JSoundPlayer>::ScriptingShutdown();
 }
 
 bool JSoundPlayer::StartMusic(JSContext* UNUSED(cx), uintN UNUSED(argc), jsval* UNUSED(argv))