Browse Source

swr/resample_template: prevent end_index from overflowing and add check for delta_frac overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
2c23f87c85
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libswresample/resample_template.c

+ 4
- 2
libswresample/resample_template.c View File

@@ -134,8 +134,10 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int
av_assert2(index >= 0);
*consumed= index;
index = 0;
} else if (compensation_distance == 0 && index >= 0) {
int64_t end_index = (1 + src_size - c->filter_length) << c->phase_shift;
} else if (compensation_distance == 0 &&
index >= 0 &&
src_size*(int64_t)c->src_incr < (INT64_MAX >> (c->phase_shift+1))) {
int64_t end_index = (1LL + src_size - c->filter_length) << c->phase_shift;
int64_t delta_frac = (end_index - index) * c->src_incr - c->frac;
int delta_n = (delta_frac + c->dst_incr - 1) / c->dst_incr;
int n = FFMIN(dst_size, delta_n);


Loading…
Cancel
Save