aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-10-21 18:04:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-07 23:38:06 +0100
commitd25736dc871b46f9e22e6b23b4b8e131e685a9c4 (patch)
tree1fa01c11fc7c36ecfe341c6e18f894346440e065
parent6ccf19198b360cfc3fe5cd274948cfde2fe305e0 (diff)
downloadffmpeg-d25736dc871b46f9e22e6b23b4b8e131e685a9c4.tar.gz
avcodec/h264dec: Fix potential array overread
add padding before scantable arrays See: 522d850e68ec4b77d3477b3c8f55b1ba00a9d69a Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 380b48fb9fdc7b0c40d67e026f9b3accb12794eb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264dec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 2106ba077e..de8b7c38b9 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -416,6 +416,7 @@ typedef struct H264Context {
uint8_t (*mvd_table[2])[2];
uint8_t *direct_table;
+ uint8_t scan_padding[16];
uint8_t zigzag_scan[16];
uint8_t zigzag_scan8x8[64];
uint8_t zigzag_scan8x8_cavlc[64];