aboutsummaryrefslogtreecommitdiffstats
path: root/libSACdec/src/sac_dec_lib.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2019-03-15 14:03:19 +0200
committerMartin Storsjo <martin@martin.st>2019-03-15 14:03:19 +0200
commit4edc5c4808c2a21e6dc8dc6c8d5a00290d042528 (patch)
treef4e87a39dfeadfb60bfadc9f6851c1cf4420e856 /libSACdec/src/sac_dec_lib.cpp
parent95858d7bd36f19bde4a9595e2bd68f195215b164 (diff)
parentd5724aefe91189c173833d792f1ab1b5e17d8eec (diff)
downloadfdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.tar.gz
fdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.tar.bz2
fdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSACdec/src/sac_dec_lib.cpp')
-rw-r--r--libSACdec/src/sac_dec_lib.cpp4
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 *