aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-12-29 14:10:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-29 14:10:58 +0000
commitf8881d4bfeb0027c6da646a85f4235e3044da028 (patch)
tree4ed455eb7bb969fe1cc2975701bcc8bb05d9bebb
parentcf4098ed3ba7030b52c129db0dbb9d51b49384e6 (diff)
parentb9f1b6dec01dab90aed33974603f188c7f6b1b5d (diff)
downloadfdk-aac-f8881d4bfeb0027c6da646a85f4235e3044da028.tar.gz
fdk-aac-f8881d4bfeb0027c6da646a85f4235e3044da028.tar.bz2
fdk-aac-f8881d4bfeb0027c6da646a85f4235e3044da028.zip
Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()"
-rw-r--r--libFDK/src/FDK_qmf_domain.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libFDK/src/FDK_qmf_domain.cpp b/libFDK/src/FDK_qmf_domain.cpp
index dd63dab..3245deb 100644
--- a/libFDK/src/FDK_qmf_domain.cpp
+++ b/libFDK/src/FDK_qmf_domain.cpp
@@ -983,9 +983,8 @@ QMF_DOMAIN_ERROR FDK_QmfDomain_Configure(HANDLE_FDK_QMF_DOMAIN hqd) {
}
bail:
- if (err == QMF_DOMAIN_OUT_OF_MEMORY) {
- FDK_QmfDomain_FreePersistentMemory(hqd);
- FDK_QmfDomain_ClearConfigured(&hqd->globalConf);
+ if (err) {
+ FDK_QmfDomain_FreeMem(hqd);
}
return err;
}