summaryrefslogtreecommitdiff
path: root/libavformat/flvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-01-03 03:03:31 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-03 03:25:25 +0100
commit4221c68edbc86c85512554deb56a925d2930fc0a (patch)
tree8655ca81627fcd0dfa1d440a04d3ca25f777b9ca /libavformat/flvenc.c
parente8651f51aa46268613b328c60079e16d992e013f (diff)
downloadffmpeg-4221c68edbc86c85512554deb56a925d2930fc0a.tar.gz
avformat/flvenc: Check for extradata allocation failure
Fixes CID1396539 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/flvenc.c')
-rw-r--r--libavformat/flvenc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 62d406a031..5714321282 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);