diff options
| author | Glenn Kasten <gkasten@android.com> | 2016-04-20 23:40:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:40:45 +0000 |
| commit | c3f7cf7f1b8987a873ceea8c1b45206dd611e425 (patch) | |
| tree | d934b40fe0a70c9278e7d0f7db1f8223b3e47b39 | |
| parent | e34e2b9d54680b7d59104b8398d10f6d4d8c5be6 (diff) | |
| parent | 27625f27066421ce38250272f4bb751cf6f58c17 (diff) | |
| download | fdk-aac-c3f7cf7f1b8987a873ceea8c1b45206dd611e425.tar.gz fdk-aac-c3f7cf7f1b8987a873ceea8c1b45206dd611e425.tar.bz2 fdk-aac-c3f7cf7f1b8987a873ceea8c1b45206dd611e425.zip | |
Merge "Add default case for undefined pointer initialization" am: 9d0179c
am: 27625f2
* commit '27625f27066421ce38250272f4bb751cf6f58c17':
Add default case for undefined pointer initialization
Change-Id: I601dc2afdfa8db2008628e05068d277a617c022d
| -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 dacd951..4d53a13 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 */ |