OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f062947
)
avcodec/scpr: do not allow out of array access for 16bit case
author
Paul B Mahol
<onemda@gmail.com>
Thu, 23 Feb 2017 16:22:01 +0000
(17:22 +0100)
committer
Paul B Mahol
<onemda@gmail.com>
Thu, 23 Feb 2017 16:22:01 +0000
(17:22 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/scpr.c
patch
|
blob
|
history
diff --git
a/libavcodec/scpr.c
b/libavcodec/scpr.c
index
f53f1d4
..
73e7eed
100644
(file)
--- a/
libavcodec/scpr.c
+++ b/
libavcodec/scpr.c
@@
-408,7
+408,7
@@
static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
}
if (avctx->bits_per_coded_sample == 16) {
- cx1 = (clr & 0x
F
F00) >> 2;
+ cx1 = (clr & 0x
3
F00) >> 2;
cx = (clr & 0xFFFFFF) >> 16;
} else {
cx1 = (clr & 0xFC00) >> 4;
@@
-647,7
+647,7
@@
static int decompress_p(AVCodecContext *avctx,
}
if (avctx->bits_per_coded_sample == 16) {
- cx1 = (clr & 0x
F
F00) >> 2;
+ cx1 = (clr & 0x
3
F00) >> 2;
cx = (clr & 0xFFFFFF) >> 16;
} else {
cx1 = (clr & 0xFC00) >> 4;