From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 3 Dec 2016 22:44:56 +0000 (+0100)
Subject: avcodec/get_bits: Fix get_sbits_long(0)
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c72fa432349881d5a445cd110abf698cc94d490d;p=ffmpeg

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>
---

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 0f183e03583..e8888419b5c 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);
 }