commit 65b17680192efb65145687e003d12abd0c20069b
author Ray Essick <essick@google.com> Mon Jul 18 04:50:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 18 04:50:08 2022 +0000
tree 11730e56828551cb09b205623ea98f3e49721016
parent 0e7de9a73d8d6d61ac830c7a1b6c66fc732d70e4
parent 865417c77ec106bdd2265701d4bf629b50497a55

Merge "Tremolo: Update check for valid floor0 order value" am: df8e372cbf am: 66ede42485 am: 865417c77e

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2110124

Change-Id: Ia3288f775f340faadda79485a43be232baf33390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tremolo/floor0.c

diff --git a/Tremolo/floor0.c b/Tremolo/floor0.c
index 11452c5..cb9657f 100644
--- a/Tremolo/floor0.c
+++ b/Tremolo/floor0.c
@@ -386,7 +386,8 @@
   info->ampdB=oggpack_read(opb,8);
   info->numbooks=oggpack_read(opb,4)+1;
 
-  if(info->order<1)goto err_out;
+  /* order must be greater than 1 to calculate p and q parameters for the linear floor value */
+  if(info->order<=1)goto err_out;
   if(info->rate<1)goto err_out;
   if(info->barkmap<1)goto err_out;