|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
diff -ru libvorbis-1.3.5.orig/lib/info.c libvorbis-1.3.5/lib/info.c
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
--- libvorbis-1.3.5.orig/lib/info.c 2015-02-26 22:58:19.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
@@ -583,7 +583,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
oggpack_buffer opb;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
private_state *b=v->backend_state;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
- if(!b||vi->channels<=0){
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ if(!b||vi->channels<=0||vi->channels>256){
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ b = NULL;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
ret=OV_EFAULT;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
goto err_out;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
diff -ru libvorbis-1.3.5.orig/lib/psy.c libvorbis-1.3.5/lib/psy.c
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
--- libvorbis-1.3.5.orig/lib/psy.c 2013-11-12 05:01:54.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
@@ -600,7 +600,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
XY[i] = tXY;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
- for (i = 0, x = 0.f;; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
lo = b[i] >> 16;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
if( lo>=0 ) break;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
@@ -622,12 +622,11 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
noise[i] = R - offset;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
- for ( ;; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ for ( ; i < n; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
lo = b[i] >> 16;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
hi = b[i] & 0xffff;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
if(hi>=n)break;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
tN = N[hi] - N[lo];
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
tX = X[hi] - X[lo];
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
tXX = XX[hi] - XX[lo];
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
@@ -652,7 +651,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
if (fixed <= 0) return;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
- for (i = 0, x = 0.f;; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
hi = i + fixed / 2;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
lo = hi - fixed;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
if(lo>=0)break;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
@@ -671,7 +670,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
if (R - offset < noise[i]) noise[i] = R - offset;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
- for ( ;; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
+ for ( ; i < n; i++, x += 1.f) {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
hi = i + fixed / 2;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
fe5370 |
lo = hi - fixed;
|