aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-04-11 15:08:07 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-04-11 23:39:21 +0200
commit4f325589f95c0758d9624122bd00ec2897cc903d (patch)
tree4296152971ce2e2aefb51c7569a558ba683d0ab1
parent707d4c7fb5cee9f97fce848e8c3175c4a22ecdfb (diff)
downloadffmpeg-4f325589f95c0758d9624122bd00ec2897cc903d.tar.gz
avformat/oggparseogm: Check ff_alloc_extradata() for failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9eff4b0d2b5013e1ede86cf1a152dce164217d52) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/oggparseogm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index cdbdfd66e0..e7a501b5a7 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -110,7 +110,8 @@ ogm_header(AVFormatContext *s, int idx)
size -= 52;
if (bytestream2_get_bytes_left(&p) < size)
return AVERROR_INVALIDDATA;
- ff_alloc_extradata(st->codecpar, size);
+ if (ff_alloc_extradata(st->codecpar, size) < 0)
+ return AVERROR(ENOMEM);
bytestream2_get_buffer(&p, st->codecpar->extradata, st->codecpar->extradata_size);
}
}