Changeset 9c54265

Timestamp:

Jul 13, 2006, 3:45:37 PM (18 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

470a772

Parents:

dde06ad

Message:

fix out of boundaries write in hist
fix out of boundaries write in hist

File:

• src/hist.c (modified) (4 diffs)

src/hist.c

@@ -79 +79 @@
 {
         uint_t i,j;
+        sint_t tmp = 0;
+        aubio_scale_do(s->scaler, input);
+        /* reset data */
+        for (i=0; i < s->channels; i++)
+                for (j=0; j < s->nelems; j++) 
+                        s->hist[i][j] = 0;
+        /* run accum */
+        for (i=0; i < input->channels; i++)
+                for (j=0;  j < input->length; j++)
+                {
+                        tmp = (sint_t)FLOOR(input->data[i][j]);
+                        if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+                                s->hist[i][tmp] += 1;
+                }
+}
+
+void aubio_hist_do_notnull (aubio_hist_t *s, fvec_t *input) 
+{
+        uint_t i,j;
+        sint_t tmp = 0;
         aubio_scale_do(s->scaler, input);
         /* reset data */
@@ -87 +107 @@
         for (i=0; i < input->channels; i++)
                 for (j=0;  j < input->length; j++) 
-                                s->hist[i][(uint_t)floor(input->data[i][j])] += 1;
-}
-
-void aubio_hist_do_notnull (aubio_hist_t *s, fvec_t *input) 
-{
-        uint_t i,j;
-        aubio_scale_do(s->scaler, input);
-        /* reset data */
-        for (i=0; i < s->channels; i++)
-                for (j=0; j < s->nelems; j++) 
-                        s->hist[i][j] = 0;
-        /* run accum */
-        for (i=0; i < input->channels; i++)
-                for (j=0;  j < input->length; j++) 
-                        if (input->data[i][j]!=0.0f) //input is not 0
-                                s->hist[i][(uint_t)floor(input->data[i][j])] += 1;
+                {
+                        if (input->data[i][j] != 0) {
+                                tmp = (sint_t)FLOOR(input->data[i][j]);
+                                if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+                                        s->hist[i][tmp] += 1;
+                        }
+                }
 }
 
@@ -109 +120 @@
 {
         uint_t i,j;
+        sint_t tmp = 0;
         smpl_t ilow = vec_min(input);
         smpl_t ihig = vec_max(input);
@@ -131 +143 @@
         for (i=0; i < input->channels; i++)
                 for (j=0;  j < input->length; j++) 
-                        if (input->data[i][j]!=0.) //input was not 0
-                                s->hist[i][(uint_t)floorf(input->data[i][j])] += 1;
+                {
+                        if (input->data[i][j] != 0) {
+                                tmp = (sint_t)FLOOR(input->data[i][j]);
+                                if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+                                        s->hist[i][tmp] += 1;
+                        }
+                }
 }