diff options
| author | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
| commit | 8fe6faf261313279879f7fbce8798f03aa63ebd5 (patch) | |
| tree | 39d67cd6aa0b970eef549eb090dba17c83f26aa4 /libSBRdec | |
| parent | f132ac5f3dd37f9810b40d36caaa53e0f4ecfd06 (diff) | |
| parent | 8192b1a98f60cc39253c658ba1ca70a70c2e0dfa (diff) | |
| download | fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.gz fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.bz2 fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSBRdec')
| -rw-r--r-- | libSBRdec/src/env_extr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libSBRdec/src/env_extr.cpp b/libSBRdec/src/env_extr.cpp index 6cb0b99..bdb29e5 100644 --- a/libSBRdec/src/env_extr.cpp +++ b/libSBRdec/src/env_extr.cpp @@ -904,6 +904,9 @@ static const FRAME_INFO v_frame_info4_8 = { 0, 4, {0, 2, 4, 6, 8}, {1, 1, 1, 1}, break; default: FDK_ASSERT(0); + /* in case assertion checks are disabled, force a definite memory fault at first access */ + pTable = NULL; + break; } /* look number of envelopes in table */ |