Bug 1341254 - Put the modification made to the resampler code in bug 1274083 into their own patch, and add this patch to update.sh. r?karlt draft
authorPaul Adenot <paul@paul.cx>
Mon, 06 Mar 2017 16:15:07 +0100
changeset 494081 7cb474163f2e6e270ebb83365cbe6f6960e34554
parent 494001 966464a68a2cb3ca1125808e34abb5c1d34e3797
child 494082 ac1e12f8ca0a3a635a0501cee3be5fc9a8fc363d
push id47929
push userpaul@paul.cx
push dateMon, 06 Mar 2017 16:19:15 +0000
reviewerskarlt
bugs1341254, 1274083
milestone54.0a1
Bug 1341254 - Put the modification made to the resampler code in bug 1274083 into their own patch, and add this patch to update.sh. r?karlt MozReview-Commit-ID: IAOWdGS0jM
media/libspeex_resampler/set-rate-overflow-no-return.patch
media/libspeex_resampler/update.sh
new file mode 100644
--- /dev/null
+++ b/media/libspeex_resampler/set-rate-overflow-no-return.patch
@@ -0,0 +1,23 @@
+--- a/media/libspeex_resampler/src/resample.c
++++ b/media/libspeex_resampler/src/resample.c
+@@ -1146,17 +1146,19 @@ EXPORT int speex_resampler_set_rate_frac
+       }
+    }
+       
+    if (old_den > 0)
+    {
+       for (i=0;i<st->nb_channels;i++)
+       {
+          if (!_muldiv_safe(st->samp_frac_num[i],st->den_rate,old_den))
+-            return RESAMPLER_ERR_OVERFLOW;
++         {
++             st->samp_frac_num[i] = st->den_rate-1;
++         }
+          st->samp_frac_num[i]= _muldiv(st->samp_frac_num[i],st->den_rate,old_den);
+          /* Safety net */
+          if (st->samp_frac_num[i] >= st->den_rate)
+             st->samp_frac_num[i] = st->den_rate-1;
+       }
+    }
+    
+    if (st->initialised)
--- a/media/libspeex_resampler/update.sh
+++ b/media/libspeex_resampler/update.sh
@@ -22,8 +22,9 @@ cp $1/COPYING .
 # apply outstanding local patches
 patch -p3 < outside-speex.patch
 patch -p3 < simd-detect-runtime.patch
 patch -p3 < set-skip-frac.patch
 patch -p3 < hugemem.patch
 patch -p3 < remove-empty-asm-clobber.patch
 patch -p3 < handle-memory-error.patch
 patch -p3 < fix-overflow.patch
+patch -p3 < set-rate-overflow-no-return.patch