Changeset 868c6b8 for src/pitch/pitchyinfast.c

Timestamp:

Dec 19, 2018, 6:16:29 PM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/constantq

Children:

dfe6ab6

Parents:

f87e191 (diff), fda3394 (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 'master' into feature/constantq

File:

• src/pitch/pitchyinfast.c (modified) (2 diffs)

src/pitch/pitchyinfast.c

@@ -59 +59 @@
   o->kernel_fft = new_fvec (bufsize);
   o->fft = new_aubio_fft (bufsize);
+  if (!o->yin || !o->tmpdata || !o->tmpdata || !o->sqdiff
+      || !o->kernel || !o->samples_fft || !o->kernel || !o->fft)
+  {
+    del_aubio_pitchyinfast(o);
+    return NULL;
+  }
   o->tol = 0.15;
   o->peak_pos = 0;
@@ -67 +73 @@
 del_aubio_pitchyinfast (aubio_pitchyinfast_t * o)
 {
-  del_fvec (o->yin);
-  del_fvec (o->tmpdata);
-  del_fvec (o->sqdiff);
-  del_fvec (o->kernel);
-  del_fvec (o->samples_fft);
-  del_fvec (o->kernel_fft);
-  del_aubio_fft (o->fft);
+  if (o->yin)
+    del_fvec (o->yin);
+  if (o->tmpdata)
+    del_fvec (o->tmpdata);
+  if (o->sqdiff)
+    del_fvec (o->sqdiff);
+  if (o->kernel)
+    del_fvec (o->kernel);
+  if (o->samples_fft)
+    del_fvec (o->samples_fft);
+  if (o->kernel_fft)
+    del_fvec (o->kernel_fft);
+  if (o->fft)
+    del_aubio_fft (o->fft);
   AUBIO_FREE (o);
 }