Changeset 868c6b8 for src/io/source.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/io/source.c (modified) (2 diffs)

src/io/source.c

@@ -122 +122 @@
      " (no source built-in)\n", uri, samplerate, hop_size);
 #endif
-  AUBIO_FREE(s);
+  del_aubio_source(s);
   return NULL;
 }
@@ -139 +139 @@
 
 void del_aubio_source(aubio_source_t * s) {
-  if (!s) return;
-  s->s_del((void *)s->source);
+  AUBIO_ASSERT(s);
+  if (s->s_del && s->source)
+    s->s_del((void *)s->source);
   AUBIO_FREE(s);
 }