virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

af_hdcd: fix bounds check in hdcd_envelope()

Browse Source 
From Sebastian Ramacher.
https://github.com/bp0/libhdcd/pull/11

Signed-off-by: Burt P <pburt0@gmail.com>
This commit is contained in:
Burt P
2016-09-08 18:06:54 -05:00
parent 21de33dd83
commit 91117fc9f1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/af_hdcd.c
View File

@@ -1388,15 +1388,18 @@ static int hdcd_analyze(int32_t *samples, int count, int stride, int gain, int t
/** apply HDCD decoding parameters to a series of samples */ /** apply HDCD decoding parameters to a series of samples */
static int hdcd_envelope(int32_t *samples, int count, int stride, int gain, int target_gain, int extend) static int hdcd_envelope(int32_t *samples, int count, int stride, int gain, int target_gain, int extend)
{ {
int i; static const int max_asample = sizeof(peaktab) / sizeof(peaktab[0]) - 1;
int32_t *samples_end = samples + stride * count; int32_t *samples_end = samples + stride * count;
int i;
av_assert0(PEAK_EXT_LEVEL + max_asample == 0x8000);
if (extend) { if (extend) {
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int32_t sample = samples[i * stride]; int32_t sample = samples[i * stride];
int32_t asample = abs(sample) - PEAK_EXT_LEVEL; int32_t asample = abs(sample) - PEAK_EXT_LEVEL;
if (asample >= 0) { if (asample >= 0) {
av_assert0(asample < sizeof(peaktab)); av_assert0(asample <= max_asample);
sample = sample >= 0 ? peaktab[asample] : -peaktab[asample]; sample = sample >= 0 ? peaktab[asample] : -peaktab[asample];
} else } else
sample <<= 15; sample <<= 15;