diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-03-08 23:14:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-23 01:44:40 +0200 |
| commit | 46f37c65abc0624168a88c7093baacd1e6b9a185 (patch) | |
| tree | 38a0dcd3670c2cdee8f39d7858432b4a4a7f6c81 | |
| parent | 4df16ad1ef065e86279c3fc2bd2a38cc88dafcf8 (diff) | |
| download | ffmpeg-46f37c65abc0624168a88c7093baacd1e6b9a185.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>
| -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 d63c83b1c2..11e3c04479 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -176,7 +176,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; } |