commit a556a32eaebefc94025cf67e211385828881d7d9
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Sat Dec 29 06:25:50 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sat Dec 29 06:25:50 2018 -0800
tree 8e5e714b47fed78744b471103d8ba45ce80c6495
parent ca5723b92244e44a343febda95dbac59805c16bb
parent 005d5690b6fe8fd0d0f624c34ddf9b578815525d

Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()" am: f8881d4bfe
am: 005d5690b6

Change-Id: I4c63548e0a96ffed45f64d0a14c1764acac25d2c

libFDK/src/FDK_qmf_domain.cpp

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 @@
   }
 
 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;
 }