[vlc-devel] commit: codec_fake: Fix potential crash ( add and delete the callback at the right ( Rémi Duraffort )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 26 15:07:34 2009 +0200| [a091bf7233634946c018b2de0ac0cdf504a2414d] | committer: Rémi Duraffort 

codec_fake: Fix potential crash (add and delete the callback at the right
moment).
(cherry picked from commit 7261448ee66f508864148088b4eafaa80a845ab0)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a091bf7233634946c018b2de0ac0cdf504a2414d
---

 modules/codec/fake.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 0696eb1..773dd92 100644
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -154,7 +154,6 @@ static int OpenDecoder( vlc_object_t *p_this )
         free( p_dec->p_sys );
         return VLC_EGENERIC;
     }
-    var_AddCallback( p_dec, "fake-file", FakeCallback, p_dec );
 
     memset( &fmt_in, 0, sizeof(fmt_in) );
     memset( &fmt_out, 0, sizeof(fmt_out) );
@@ -166,7 +165,6 @@ static int OpenDecoder( vlc_object_t *p_this )
         p_dec->p_sys->i_reload = (mtime_t)(val.i_int * 1000000);
         p_dec->p_sys->i_next   = (mtime_t)(p_dec->p_sys->i_reload + mdate());
     }
-    var_AddCallback( p_dec, "fake-file-reload", FakeCallback , p_dec );
 
     psz_chroma = var_CreateGetString( p_dec, "fake-chroma" );
     if( strlen( psz_chroma ) != 4 )
@@ -330,6 +328,10 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_dec->p_sys->p_image = p_image;
     vlc_mutex_init( &p_dec->p_sys->lock );
 
+    /* Add the callback when every variables are available */
+    var_AddCallback( p_dec, "fake-file", FakeCallback, p_dec );
+    var_AddCallback( p_dec, "fake-file-reload", FakeCallback , p_dec );
+
     return VLC_SUCCESS;
 }
 
@@ -376,6 +378,9 @@ static void CloseDecoder( vlc_object_t *p_this )
     decoder_t *p_dec = (decoder_t *)p_this;
     picture_t *p_image = p_dec->p_sys->p_image;
 
+    var_DelCallback( p_dec, "fake-file", FakeCallback, p_dec );
+    var_DelCallback( p_dec, "fake-file-reload", FakeCallback , p_dec );
+
     if( p_image != NULL )
         picture_Release( p_image );