virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/matroskadec: address a missing AVPacket free

Browse Source 
Fixes memleaks.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-04-04 10:54:14 -03:00
parent 2accdd3871
commit 2f0e0deadc
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/matroskadec.c
View File

@ -3152,7 +3152,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
MatroskaTrackEncoding *encodings = track->encodings.elem; MatroskaTrackEncoding *encodings = track->encodings.elem;
uint8_t *pkt_data = data; uint8_t *pkt_data = data;
int offset = 0, res; int offset = 0, res;
AVPacket *pkt; AVPacket pktl, *pkt = &pktl;
if (encodings && !encodings->type && encodings->scope & 1) { if (encodings && !encodings->type && encodings->scope & 1) {
res = matroska_decode_buffer(&pkt_data, &pkt_size, track); res = matroska_decode_buffer(&pkt_data, &pkt_size, track);
@ -3177,15 +3177,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
AV_RB32(&data[4]) != MKBETAG('i', 'c', 'p', 'f')) AV_RB32(&data[4]) != MKBETAG('i', 'c', 'p', 'f'))
offset = 8; offset = 8;
pkt = av_mallocz(sizeof(AVPacket));
if (!pkt) {
if (pkt_data != data)
av_freep(&pkt_data);
return AVERROR(ENOMEM);
}
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
if (av_new_packet(pkt, pkt_size + offset) < 0) { if (av_new_packet(pkt, pkt_size + offset) < 0) {
av_free(pkt);
res = AVERROR(ENOMEM); res = AVERROR(ENOMEM);
goto fail; goto fail;
} }
@ -3210,7 +3203,6 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
additional_size + 8); additional_size + 8);
if (!side_data) { if (!side_data) {
av_packet_unref(pkt); av_packet_unref(pkt);
av_free(pkt);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
AV_WB64(side_data, additional_id); AV_WB64(side_data, additional_id);
@ -3223,7 +3215,6 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
10); 10);
if (!side_data) { if (!side_data) {
av_packet_unref(pkt); av_packet_unref(pkt);
av_free(pkt);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
discard_padding = av_rescale_q(discard_padding, discard_padding = av_rescale_q(discard_padding,
@ -3253,7 +3244,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
res = ff_packet_list_put(&matroska->queue, &matroska->queue_end, pkt, 0); res = ff_packet_list_put(&matroska->queue, &matroska->queue_end, pkt, 0);
if (res < 0) { if (res < 0) {
av_packet_free(&pkt); av_packet_unref(pkt);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }