jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps-libff: Fix memory leak in ff_demuxer_reset

Browse Source 
The reset method unnecessarily malloced a packet passed into
the packet buffer which does a dereferencing copy.
This commit is contained in:
John Bradley 2015-03-20 17:14:23 -05:00
parent 9bc0d5a0c2
commit c78fa63b47
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/libff/libff/ff-demuxer.c vendored
View File

@ -319,21 +319,23 @@ void ff_demuxer_flush(struct ff_demuxer *demuxer)
void ff_demuxer_reset(struct ff_demuxer *demuxer) void ff_demuxer_reset(struct ff_demuxer *demuxer)
{ {
struct ff_packet *packet = av_mallocz(sizeof(struct ff_packet)); struct ff_packet packet = {0};
struct ff_clock *clock = ff_clock_init(); struct ff_clock *clock = ff_clock_init();
clock->sync_type = demuxer->clock.sync_type; clock->sync_type = demuxer->clock.sync_type;
clock->sync_clock = demuxer->clock.sync_clock; clock->sync_clock = demuxer->clock.sync_clock;
clock->opaque = demuxer->clock.opaque; clock->opaque = demuxer->clock.opaque;
packet->clock = clock; packet.clock = clock;
if (demuxer->audio_decoder != NULL) { if (demuxer->audio_decoder != NULL) {
packet_queue_put(&demuxer->audio_decoder->packet_queue, packet); packet_queue_put(&demuxer->audio_decoder->packet_queue,
&packet);
ff_clock_retain(clock); ff_clock_retain(clock);
} }
if (demuxer->video_decoder != NULL) { if (demuxer->video_decoder != NULL) {
packet_queue_put(&demuxer->video_decoder->packet_queue, packet); packet_queue_put(&demuxer->video_decoder->packet_queue,
&packet);
ff_clock_retain(clock); ff_clock_retain(clock);
} }
} }