diff options
| author | Ray Essick <essick@google.com> | 2022-07-18 05:33:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-18 05:33:50 +0000 |
| commit | b6d120967d40155ad99da2fd7b397bd72d899eef (patch) | |
| tree | 11730e56828551cb09b205623ea98f3e49721016 | |
| parent | a6c1bc14ec55084fef9edab90b6b20ba38ee43db (diff) | |
| parent | 65b17680192efb65145687e003d12abd0c20069b (diff) | |
| download | tremolo-b6d120967d40155ad99da2fd7b397bd72d899eef.tar.gz | |
Merge "Tremolo: Update check for valid floor0 order value" am: df8e372cbf am: 66ede42485 am: 865417c77e am: 65b1768019
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2110124
Change-Id: I9260df9849981195500e4e83bd6b262641a2cf9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Tremolo/floor0.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ vorbis_info_floor *floor0_info_unpack (vorbis_info *vi,oggpack_buffer *opb){ 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; |