diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-08-09 17:08:05 +0200 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2019-10-11 10:05:36 -0700 |
| commit | 0be235952d653d9932b8cb180cdb16560506b98c (patch) | |
| tree | 615f2be4eb5fd897e0a2a0d1b727d538b4eeb22c | |
| parent | 572f59359a5e71f59a09e2dbc75aa45e7eaaa360 (diff) | |
| download | fdk-aac-0be235952d653d9932b8cb180cdb16560506b98c.tar.gz fdk-aac-0be235952d653d9932b8cb180cdb16560506b98c.tar.bz2 fdk-aac-0be235952d653d9932b8cb180cdb16560506b98c.zip | |
Solve potential dereference of null pointers in factorCLD().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I27334567d1887755d62fadf2456fd5366869cbab
| -rw-r--r-- | libSACdec/src/sac_bitdec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp index c814b41..4b47132 100644 --- a/libSACdec/src/sac_bitdec.cpp +++ b/libSACdec/src/sac_bitdec.cpp @@ -1586,9 +1586,9 @@ static SACDEC_ERROR mapIndexData( for (ps = 0; ps < numParameterSets; ps++) { if (quantMode && (paramType == t_CLD)) { if (pOttVsTotDbIn == 0) return MPS_WRONG_OTT; - if ((pOttVsTotDb1 == 0) && (ottVsTotDbMode == ottVsTotDb1Activ)) + if ((pOttVsTotDb1 == 0) && (ottVsTotDbMode & ottVsTotDb1Activ)) return MPS_WRONG_OTT; - if ((pOttVsTotDb2 == 0) && (ottVsTotDbMode == ottVsTotDb2Activ)) + if ((pOttVsTotDb2 == 0) && (ottVsTotDbMode & ottVsTotDb2Activ)) return MPS_WRONG_OTT; for (pb = startBand; pb < stopBand; pb++) { |