aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2017-08-15 14:57:37 +0300
committerMartin Storsjo <martin@martin.st>2017-08-15 23:12:51 +0300
commit393a86c0dbffdf741e44b84e6a88eb1c2138073d (patch)
treeb525e3cbd66700560829acc23692d695c3d26ddc
parentee6d9476a656195460c903bde741e96be4220660 (diff)
downloadfdk-aac-393a86c0dbffdf741e44b84e6a88eb1c2138073d.tar.gz
fdk-aac-393a86c0dbffdf741e44b84e6a88eb1c2138073d.tar.bz2
fdk-aac-393a86c0dbffdf741e44b84e6a88eb1c2138073d.zip
Check that pSettings is initialized
Fixes: 2872/clusterfuzz-testcminimized-4529959869612032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-rw-r--r--libSBRdec/src/sbrdecoder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp
index 766d7e9..7d9468c 100644
--- a/libSBRdec/src/sbrdecoder.cpp
+++ b/libSBRdec/src/sbrdecoder.cpp
@@ -1446,6 +1446,10 @@ sbrDecoder_DecodeElement (
if (channelMapping[0] == 255 || channelMapping[1] == 255)
return SBRDEC_UNSUPPORTED_CONFIG;
+ if (!pSbrChannel[0]->SbrDec.LppTrans.pSettings)
+ return SBRDEC_UNSUPPORTED_CONFIG;
+ if (stereo && !pSbrChannel[1]->SbrDec.LppTrans.pSettings)
+ return SBRDEC_UNSUPPORTED_CONFIG;
/* Set strides for reading and writing */
if (interleaved) {