diff options
| author | jstebbins <[email protected]> | 2011-01-13 17:39:02 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-01-13 17:39:02 +0000 |
| commit | 994040e5568bc19512e18384354f7df62cf98f66 (patch) | |
| tree | 357732a12931f36f60f5cdcbcd85610400e65b1d | |
| parent | 7deffcb2407575dea5840442e272eb7adce93839 (diff) | |
fix double free in handling of last CC message
the code dealing with cc messages stores the last message in 2 places.
sometimes it would free both and sometimes it would send one down the
pipeline and free the other.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3743 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/decmpeg2.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c index 3beef06d1..1d2d059b8 100644 --- a/libhb/decmpeg2.c +++ b/libhb/decmpeg2.c @@ -671,7 +671,15 @@ static void hb_libmpeg2_close( hb_libmpeg2_t ** _m ) for ( i = 0; i < NTAGS; ++i ) { if ( m->tags[i].cc_buf ) + { + if ( m->tags[i].cc_buf == m->last_cc1_buf ) + m->last_cc1_buf = NULL; hb_buffer_close( &m->tags[i].cc_buf ); + } + } + if ( m->last_cc1_buf ) + { + hb_buffer_close( &m->last_cc1_buf ); } free( m ); @@ -782,6 +790,11 @@ static int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in, if ( pv->libmpeg2->last_cc1_buf ) { cc_send_to_decoder( pv->libmpeg2, pv->libmpeg2->last_cc1_buf ); + if ( pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf == + pv->libmpeg2->last_cc1_buf ) + { + pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf = NULL; + } pv->libmpeg2->last_cc1_buf = NULL; } cc_send_to_decoder( pv->libmpeg2, hb_buffer_init( 0 ) ); @@ -821,10 +834,6 @@ static void decmpeg2Close( hb_work_object_t * w ) { hb_log( "mpeg2 done: %d frames", pv->libmpeg2->nframes ); } - if ( pv->libmpeg2->last_cc1_buf ) - { - hb_buffer_close( &pv->libmpeg2->last_cc1_buf ); - } hb_list_close( &pv->list ); if ( pv->libmpeg2->list_subtitle ) { |