git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8c41453
)
diracdec: check wavelet depth, prevent out of array read.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 16:20:10 +0000
(17:20 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 16:20:36 +0000
(17:20 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/diracdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/diracdec.c
b/libavcodec/diracdec.c
index
c70a0c7
..
6e81491
100644
(file)
--- a/
libavcodec/diracdec.c
+++ b/
libavcodec/diracdec.c
@@
-996,6
+996,10
@@
static int dirac_unpack_idwt_params(DiracContext *s)
s->lowdelay.quant[level][3] = svq3_get_ue_golomb(gb);
}
} else {
+ if (s->wavelet_depth > 4) {
+ av_log(s->avctx,AV_LOG_ERROR,"Mandatory custom low delay matrix missing for depth %d\n", s->wavelet_depth);
+ return AVERROR_INVALIDDATA;
+ }
/* default quantization matrix */
for (level = 0; level < s->wavelet_depth; level++)
for (i = 0; i < 4; i++) {