fix buffer leak during indepth scan

and fix a couple potential leaks if the timing is just right in work loops

git-svn-id: svn://localhost/HandBrake/trunk@3016 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c
index c4474f9..1fd9d5b 100644 (file)
--- a/libhb/decvobsub.c
+++ b/libhb/decvobsub.c
@@ -136,6 +136,10 @@ int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
 
 void decsubClose( hb_work_object_t * w )
 {
+    hb_work_private_t * pv = w->private_data;
+
+    if ( pv->buf )
+        hb_buffer_close( &pv->buf );
     free( w->private_data );
 }
 
@@ -501,6 +505,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
          * When forcing subtitles, ignore all those that don't
          * have the forced flag set.
          */
+        hb_buffer_close( &pv->buf );
         return NULL;
     }
 

diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index dbaa9c4..7ea3c79 100644 (file)
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -369,7 +369,13 @@ static void mux_loop( void * _w )
         if ( buf_in == NULL )
             continue;
         if ( *job->die )
+        {
+            if( buf_in )
+            {
+                hb_buffer_close( &buf_in );
+            }
             break;
+        }
 
         w->status = w->work( w, &buf_in, NULL );
     }

diff --git a/libhb/work.c b/libhb/work.c
index ba4ea95..f4be983 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -922,7 +922,13 @@ static void do_job( hb_job_t * job, int cpu_count )
         if ( buf_in == NULL )
             continue;
         if ( *job->die )
+        {
+            if( buf_in )
+            {
+                hb_buffer_close( &buf_in );
+            }
             break;
+        }
 
         w->status = w->work( w, &buf_in, &buf_out );
 
@@ -1120,7 +1126,13 @@ static void work_loop( void * _w )
         if ( buf_in == NULL )
             continue;
         if ( *w->done )
+        {
+            if( buf_in )
+            {
+                hb_buffer_close( &buf_in );
+            }
             break;
+        }
 
         w->status = w->work( w, &buf_in, &buf_out );