aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-03-09 01:05:20 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-03-10 02:44:45 +0100
commit3e7c847aaf5a298b62afae12b4ecfb8e12385998 (patch)
tree86e2208ddc074e4b362cad45cc36e7544240da9c /libavformat
parent010b7b30b721b90993e05e9ee6338e88bb8debb3 (diff)
downloadffmpeg-3e7c847aaf5a298b62afae12b4ecfb8e12385998.tar.gz
avformat/oggparseogm: Check lb against psize
No testcase, this was found during code review Found-by: Matt Wolenetz <wolenetz@google.com> Reviewed-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/oggparseogm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 4b4edf26ca..a07453760b 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -176,6 +176,9 @@ ogm_packet(AVFormatContext *s, int idx)
os->pflags |= AV_PKT_FLAG_KEY;
lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
+ if (os->psize < lb + 1)
+ return AVERROR_INVALIDDATA;
+
os->pstart += lb + 1;
os->psize -= lb + 1;