aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2016-04-20 18:45:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-04-20 18:45:18 +0000
commit9d0179c8a85f2b50bafdf6715fc266bc92771756 (patch)
tree1b0edd10c191f165d9b4bd131d70604f82655c7b
parent6ae54806ab88efd76e884447680fd30b340936fd (diff)
parent1dd76496664e6e9f0d6d7aa4619a89252ab99b39 (diff)
downloadfdk-aac-9d0179c8a85f2b50bafdf6715fc266bc92771756.tar.gz
fdk-aac-9d0179c8a85f2b50bafdf6715fc266bc92771756.tar.bz2
fdk-aac-9d0179c8a85f2b50bafdf6715fc266bc92771756.zip
Merge "Add default case for undefined pointer initialization"
-rw-r--r--libSBRdec/src/env_extr.cpp3
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 */