Skip to content

F
ffmpeg.wasm-core
Commit fd7af82c authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avcodec/scpr: do not allow out of array access for 16bit case 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent f0629472
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/scpr.c
View file @ fd7af82c
...@@ -408,7 +408,7 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize) ...@@ -408,7 +408,7 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
} }
if (avctx->bits_per_coded_sample == 16) { if (avctx->bits_per_coded_sample == 16) {
cx1 = (clr & 0xFF00) >> 2; cx1 = (clr & 0x3F00) >> 2;
cx = (clr & 0xFFFFFF) >> 16; cx = (clr & 0xFFFFFF) >> 16;
} else { } else {
cx1 = (clr & 0xFC00) >> 4; cx1 = (clr & 0xFC00) >> 4;
...@@ -647,7 +647,7 @@ static int decompress_p(AVCodecContext *avctx, ...@@ -647,7 +647,7 @@ static int decompress_p(AVCodecContext *avctx,
} }
if (avctx->bits_per_coded_sample == 16) { if (avctx->bits_per_coded_sample == 16) {
cx1 = (clr & 0xFF00) >> 2; cx1 = (clr & 0x3F00) >> 2;
cx = (clr & 0xFFFFFF) >> 16; cx = (clr & 0xFFFFFF) >> 16;
} else { } else {
cx1 = (clr & 0xFC00) >> 4; cx1 = (clr & 0xFC00) >> 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment