diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 19:00:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 19:00:06 +0000 |
| commit | 27625f27066421ce38250272f4bb751cf6f58c17 (patch) | |
| tree | 1b0edd10c191f165d9b4bd131d70604f82655c7b | |
| parent | 2b2e97b893b16b69c7728d16e8653b9c94944294 (diff) | |
| parent | 9d0179c8a85f2b50bafdf6715fc266bc92771756 (diff) | |
| download | fdk-aac-27625f27066421ce38250272f4bb751cf6f58c17.tar.gz fdk-aac-27625f27066421ce38250272f4bb751cf6f58c17.tar.bz2 fdk-aac-27625f27066421ce38250272f4bb751cf6f58c17.zip | |
Merge "Add default case for undefined pointer initialization"
am: 9d0179c
* commit '9d0179c8a85f2b50bafdf6715fc266bc92771756':
Add default case for undefined pointer initialization
Change-Id: I311521adebb1949747f0cb34bee19a57d8199558
| -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 */ |