diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 23:44:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 23:45:43 +0100 |
| commit | c72fa432349881d5a445cd110abf698cc94d490d (patch) | |
| tree | 3bef65d102cd93ab2944dae4a321f3137b57075d /libavcodec/get_bits.h | |
| parent | 6567c59c4903194eeaf822aeb88b7b8dbda1354b (diff) | |
| download | ffmpeg-c72fa432349881d5a445cd110abf698cc94d490d.tar.gz | |
avcodec/get_bits: Fix get_sbits_long(0)
Fixes undefined behavior
Fixes: 640889-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/get_bits.h')
| -rw-r--r-- | libavcodec/get_bits.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 0f183e0358..e8888419b5 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -369,6 +369,10 @@ static inline uint64_t get_bits64(GetBitContext *s, int n) */ static inline int get_sbits_long(GetBitContext *s, int n) { + // sign_extend(x, 0) is undefined + if (!n) + return 0; + return sign_extend(get_bits_long(s, n), n); } |