aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/src
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-12-20 15:52:46 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2018-12-28 19:57:07 -0500
commitb9f1b6dec01dab90aed33974603f188c7f6b1b5d (patch)
tree4ed455eb7bb969fe1cc2975701bcc8bb05d9bebb /libFDK/src
parentc371e86ef4d4a6a68e8139e00745faeb8c2c82ba (diff)
downloadfdk-aac-b9f1b6dec01dab90aed33974603f188c7f6b1b5d.tar.gz
fdk-aac-b9f1b6dec01dab90aed33974603f188c7f6b1b5d.tar.bz2
fdk-aac-b9f1b6dec01dab90aed33974603f188c7f6b1b5d.zip
Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I974006c1815d68baae042ad71625ffe4c7bb39ff
Diffstat (limited to 'libFDK/src')
-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;
}