The encoder would crash in the PVQ search if fed NaNs via the float interface. This patch protects against it in two sufficient ways: Making the PVQ search robust against NaNs and by squashing NaNs to zero on input.

Thanks to David Richards for reporting this failure mode.
This commit is contained in:
Gregory Maxwell 2011-05-09 13:16:30 -04:00 committed by Jean-Marc Valin
parent 280c060bb1
commit 58ecb1ac15
2 changed files with 5 additions and 1 deletions

View file

@ -1086,6 +1086,8 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
x = SCALEIN(*pcmp); x = SCALEIN(*pcmp);
#ifndef FIXED_POINT #ifndef FIXED_POINT
if (!(x==x))
x = 0;
if (st->clip) if (st->clip)
x = MAX32(-65536.f, MIN32(65536.f,x)); x = MAX32(-65536.f, MIN32(65536.f,x));
#endif #endif

View file

@ -223,7 +223,9 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B,
#ifdef FIXED_POINT #ifdef FIXED_POINT
if (sum <= K) if (sum <= K)
#else #else
if (sum <= EPSILON) /* Prevents infinities and NaNs from causing too many pulses
to be allocated. 64 is an approximation of infinity here. */
if (!(sum > EPSILON && sum < 64))
#endif #endif
{ {
X[0] = QCONST16(1.f,14); X[0] = QCONST16(1.f,14);