diff options
| author | Marco Nelissen <marcone@google.com> | 2017-02-01 15:59:53 -0800 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-02-02 11:51:41 -0800 |
| commit | 38ff919eaca816cf351e00f36449820658244b17 (patch) | |
| tree | fc2fe3b126a4e80b4839f1910d4c805512286132 | |
| parent | 5dc99237d49e73c27d3eca54f6ccd97d13f94de0 (diff) | |
| download | tremolo-38ff919eaca816cf351e00f36449820658244b17.tar.gz | |
Fix divide by zero for non-arm processorandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-7.1.1_r23nougat-mr1-releasenougat-mr1-cts-release
Bug: 31647370
Bug: 33071964
Test: ran PoC for bug 31647370 on x86
Change-Id: Ibf019c01feecc7aca458a0fe35413a3749b5a284
(cherry picked from commit 69220926eb0ff01fb91f44d4fb0f7faf10edfce3)
| -rw-r--r-- | Tremolo/res012.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tremolo/res012.c b/Tremolo/res012.c index be279d0..513d9ad 100644 --- a/Tremolo/res012.c +++ b/Tremolo/res012.c @@ -153,7 +153,7 @@ int res_inverse(vorbis_dsp_state *vd,vorbis_info_residue *info, always being at most six bits */ for(k=0;k<partitions_per_word;k++){ ogg_uint32_t div=partword[j][i+k]; - partword[j][i+k]=temp/div; + partword[j][i+k]= (div == 0) ? 0 : (temp / div); temp-=partword[j][i+k]*div; } @@ -218,7 +218,7 @@ int res_inverse(vorbis_dsp_state *vd,vorbis_info_residue *info, always being at most six bits */ for(k=0;k<partitions_per_word;k++){ ogg_uint32_t div=partword[i+k]; - partword[i+k]=temp/div; + partword[i+k]= (div == 0) ? 0 : (temp / div); temp-=partword[i+k]*div; } } |