diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-02-01 07:49:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-01 07:49:57 -0800 |
| commit | 6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09 (patch) | |
| tree | a7dcb32bd00be5b642f57235267938e0dbffb0e3 /libSACdec/src | |
| parent | 7ca245e21efa4ca0c934833a3763365d85daf6bf (diff) | |
| parent | db4a1deb28561e79086d041f704c8d83b7c8a0ed (diff) | |
| download | fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.tar.gz fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.tar.bz2 fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.zip | |
Merge "Add QMF analysis band sanity check" am: b30e02cfd3
am: db4a1deb28
Change-Id: I0b4b5de02becd0a105e9958231ef2e58000d2cc8
Diffstat (limited to 'libSACdec/src')
| -rw-r--r-- | libSACdec/src/sac_dec_lib.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp index 5792858..bf6dedf 100644 --- a/libSACdec/src/sac_dec_lib.cpp +++ b/libSACdec/src/sac_dec_lib.cpp @@ -1658,6 +1658,10 @@ int mpegSurroundDecoder_Apply(CMpegSurroundDecoder *pMpegSurroundDecoder, initControlFlags = controlFlags; /* Check that provided output buffer is large enough. */ + if (pMpegSurroundDecoder->pQmfDomain->globalConf.nBandsAnalysis == 0) { + err = MPS_UNSUPPORTED_FORMAT; + goto bail; + } timeDataRequiredSize = (timeDataFrameSize * pMpegSurroundDecoder->pSpatialDec->numOutputChannelsAT * |