RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-31 20:02:07 +00:00
Code Issues Projects Releases Wiki Activity

lavf/mux: check av_dup_packet() return value.

Browse Source 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Nicolas George 2014-02-19 17:43:46 +01:00 committed by Michael Niedermayer
parent cbd9cc5997
commit 916a79227e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mux.c
View File

@ -639,6 +639,7 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
AVPacketList **next_point, *this_pktl; AVPacketList **next_point, *this_pktl;
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
int chunked = s->max_chunk_size || s->max_chunk_duration; int chunked = s->max_chunk_size || s->max_chunk_duration;
int ret;
this_pktl = av_mallocz(sizeof(AVPacketList)); this_pktl = av_mallocz(sizeof(AVPacketList));
if (!this_pktl) if (!this_pktl)
@ -654,7 +655,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE); av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE);
av_assert0(((AVFrame *)pkt->data)->buf); av_assert0(((AVFrame *)pkt->data)->buf);
} else { } else {
av_dup_packet(&this_pktl->pkt); // duplicate the packet if it uses non-allocated memory // duplicate the packet if it uses non-allocated memory
if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) {
av_free(this_pktl);
return ret;
}
av_copy_packet_side_data(&this_pktl->pkt, &this_pktl->pkt); // copy side data av_copy_packet_side_data(&this_pktl->pkt, &this_pktl->pkt); // copy side data
} }