ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Tue Jan 3 03:03:31 2017 +0100| [4221c68edbc86c85512554deb56a925d2930fc0a] | committer: Michael Niedermayer
avformat/flvenc: Check for extradata allocation failure Fixes CID1396539 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4221c68edbc86c85512554deb56a925d2930fc0a --- libavformat/flvenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 62d406a..5714321 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -890,6 +890,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { av_free(par->extradata); par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!par->extradata) { + par->extradata_size = 0; + return AVERROR(ENOMEM); + } memcpy(par->extradata, side, side_size); par->extradata_size = side_size; flv_write_codec_header(s, par); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
