Changeset bcc5387

Timestamp:

Nov 26, 2018, 11:34:01 AM (6 years ago)

Author:

Paul Brossier <piem@piem.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

Children:

1cf031a

Parents:

381a44e (diff), eda95c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fix/crash_filterbank' (thanks to @niugx)

Files:

• src/spectral/filterbank.c (modified) (2 diffs)
• tests/src/spectral/test-filterbank.c (modified) (1 diff)

src/spectral/filterbank.c

@@ -43 +43 @@
   /* allocate space for filterbank object */
   aubio_filterbank_t *fb = AUBIO_NEW (aubio_filterbank_t);
+
+  if ((sint_t)n_filters <= 0) {
+    AUBIO_ERR("filterbank: n_filters should be > 0, got %d\n", n_filters);
+    goto fail;
+  }
+  if ((sint_t)win_s <= 0) {
+    AUBIO_ERR("filterbank: win_s should be > 0, got %d\n", win_s);
+    goto fail;
+  }
   fb->win_s = win_s;
   fb->n_filters = n_filters;
@@ -54 +63 @@
 
   return fb;
+fail:
+  AUBIO_FREE (fb);
+  return NULL;
 }
 

tests/src/spectral/test-filterbank.c

@@ -8 +8 @@
   cvec_t *in_spec = new_cvec (win_s); // input vector of samples
   fvec_t *out_filters = new_fvec (n_filters); // per-band outputs
+
+  if (new_aubio_filterbank(0, win_s)) return 1;
+  if (new_aubio_filterbank(n_filters, 0)) return 1;
 
   // create filterbank object