partially fix leak of service allocated in on_start_xxx

[mlt] / src / framework / mlt_events.c

diff --git a/src/framework/mlt_events.c b/src/framework/mlt_events.c
index 3161d337ccea31dcc58bc30a91f798b6397ccae6..2a9f01530681a4d7b8632ba3d9f61e0e4d892779 100644 (file)
--- a/src/framework/mlt_events.c
+++ b/src/framework/mlt_events.c
@@ -143,7 +143,7 @@ void mlt_events_init( mlt_properties self )
        mlt_events events = mlt_events_fetch( self );
        if ( events == NULL )
        {
-               events = malloc( sizeof( struct mlt_events_struct ) );
+               events = calloc( 1, sizeof( struct mlt_events_struct ) );
                events->list = mlt_properties_new( );
                mlt_events_store( self, events );
        }
@@ -382,7 +382,6 @@ void mlt_events_disconnect( mlt_properties self, void *service )
 
 typedef struct
 {
-       int done;
        pthread_cond_t cond;
        pthread_mutex_t mutex;
 }
@@ -398,11 +397,8 @@ condition_pair;
 static void mlt_events_listen_for( mlt_properties self, condition_pair *pair )
 {
        pthread_mutex_lock( &pair->mutex );
-       if ( pair->done == 0 )
-       {
-               pthread_cond_signal( &pair->cond );
-               pthread_mutex_unlock( &pair->mutex );
-       }
+       pthread_cond_signal( &pair->cond );
+       pthread_mutex_unlock( &pair->mutex );
 }
 
 /** Prepare to wait for an event.
@@ -416,7 +412,6 @@ static void mlt_events_listen_for( mlt_properties self, condition_pair *pair )
 mlt_event mlt_events_setup_wait_for( mlt_properties self, const char *id )
 {
        condition_pair *pair = malloc( sizeof( condition_pair ) );
-       pair->done = 0;
        pthread_cond_init( &pair->cond, NULL );
        pthread_mutex_init( &pair->mutex, NULL );
        pthread_mutex_lock( &pair->mutex );
@@ -452,10 +447,10 @@ void mlt_events_close_wait_for( mlt_properties self, mlt_event event )
        {
                condition_pair *pair = event->service;
                event->owner = NULL;
-               pair->done = 0;
                pthread_mutex_unlock( &pair->mutex );
                pthread_mutex_destroy( &pair->mutex );
                pthread_cond_destroy( &pair->cond );
+               free( pair );
        }
 }