diff options
| author | Martin Storsjo <martin@martin.st> | 2012-08-10 10:57:24 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-08-10 11:01:37 +0300 |
| commit | 24021f1909ffdc5025952500bc706bf39baf89b0 (patch) | |
| tree | 469980ea7236359733988a6168be0c905e21f4ab /libAACenc/src/quantize.cpp | |
| parent | 839ae290c1f5a263613bea1a5fde863e757a8849 (diff) | |
| download | fdk-aac-24021f1909ffdc5025952500bc706bf39baf89b0.tar.gz fdk-aac-24021f1909ffdc5025952500bc706bf39baf89b0.tar.bz2 fdk-aac-24021f1909ffdc5025952500bc706bf39baf89b0.zip | |
Don't try to shift more bits than the variable length
Shifting by more than (or equal to) the variable length is
undefined in C.
Diffstat (limited to 'libAACenc/src/quantize.cpp')
| -rw-r--r-- | libAACenc/src/quantize.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libAACenc/src/quantize.cpp b/libAACenc/src/quantize.cpp index 9694901..dc85a6d 100644 --- a/libAACenc/src/quantize.cpp +++ b/libAACenc/src/quantize.cpp @@ -127,7 +127,10 @@ static void FDKaacEnc_quantizeLines(INT gain, accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]); totalShift = (16-4)-(3*(totalShift>>2)); FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */ - accu>>=totalShift; + if (totalShift < 32) + accu>>=totalShift; + else + accu = 0; quaSpectrum[line] = (SHORT)(-((LONG)(k + accu) >> (DFRACT_BITS-1-16))); } else if(accu > FL2FXCONST_DBL(0.0f)) @@ -140,7 +143,10 @@ static void FDKaacEnc_quantizeLines(INT gain, accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]); totalShift = (16-4)-(3*(totalShift>>2)); FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */ - accu>>=totalShift; + if (totalShift < 32) + accu>>=totalShift; + else + accu = 0; quaSpectrum[line] = (SHORT)((LONG)(k + accu) >> (DFRACT_BITS-1-16)); } else |