diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-03-08 23:14:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-04-13 00:35:15 +0200 |
| commit | e0a08c833dd8fafa18f4f7133c2e81df22606ab5 (patch) | |
| tree | 1d1341791ca817af657cbead28979ea7d7fb55ef /libavformat | |
| parent | 8cf7205a72f5a330781470a28485584f7d08054d (diff) | |
| download | ffmpeg-e0a08c833dd8fafa18f4f7133c2e81df22606ab5.tar.gz | |
avformat/oggparseogm: Fix undefined shift in ogm_packet()
Fixes: shift exponent 48 is too large for 32-bit type 'int'
Fixes: Chromium bug 786793
Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 010b7b30b721b90993e05e9ee6338e88bb8debb3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oggparseogm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index e7a501b5a7..4d09d174b8 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -181,7 +181,7 @@ ogm_packet(AVFormatContext *s, int idx) os->psize -= lb + 1; while (lb--) - os->pduration += p[lb+1] << (lb*8); + os->pduration += (uint64_t)p[lb+1] << (lb*8); return 0; } |