diff options
| author | Glenn Kasten <gkasten@android.com> | 2016-04-20 23:59:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:59:17 +0000 |
| commit | 0d4fdaa2d215913b0e8ea14ef4197456e0333fe7 (patch) | |
| tree | d934b40fe0a70c9278e7d0f7db1f8223b3e47b39 | |
| parent | b9a6836ccaae5b595e25c21d4179b044e6e852b4 (diff) | |
| parent | 0d9ca2d051526199e875bcddeb8e8008872188a0 (diff) | |
| download | fdk-aac-0d4fdaa2d215913b0e8ea14ef4197456e0333fe7.tar.gz fdk-aac-0d4fdaa2d215913b0e8ea14ef4197456e0333fe7.tar.bz2 fdk-aac-0d4fdaa2d215913b0e8ea14ef4197456e0333fe7.zip | |
Merge "Add default case for undefined pointer initialization" am: 9d0179c am: 27625f2 am: c3f7cf7
am: 0d9ca2d
* commit '0d9ca2d051526199e875bcddeb8e8008872188a0':
Add default case for undefined pointer initialization
Change-Id: If945c473d032adaf2ea548978424b466c7dbed7c
| -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 */ |