Changeset 5958d1e

Timestamp:

Dec 7, 2013, 7:10:52 PM (11 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, pitchshift, sampler, timestretch, yinfft+

Children:

0428150

Parents:

21e2e6db

Message:

src/spectral/phasevoc.c: check win_s and hop_s

File:

• src/spectral/phasevoc.c (modified) (2 diffs)

src/spectral/phasevoc.c

@@ -76 +76 @@
 
   if (hop_s < 1) {
-    AUBIO_ERR("Hop size is smaller than 1!\n");
-    AUBIO_ERR("Resetting hop size to half the window size.\n");
-    hop_s = win_s / 2;
+    AUBIO_ERR("got hop_size %d, but can not be < 1\n", hop_s);
+    goto beach;
+  } else if (win_s < 1) {
+    AUBIO_ERR("got buffer_size %d, but can not be < 2\n", win_s);
+    goto beach;
+  } else if (win_s < hop_s + 1) {
+    AUBIO_ERR("hop size (%d) is larger than or equal to win size (%d)\n", win_s, hop_s);
+    goto beach;
   }
 
@@ -96 +101 @@
 
   return pv;
+
+beach:
+  AUBIO_FREE (pv);
+  return NULL;
 }