Changeset 813ced8 for src

Timestamp:

Nov 26, 2018, 4:30:14 PM (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:

5c3061e

Parents:

fe6a9a23

Message:

[dct] fail plain creation if size <= 0

File:

• src/spectral/dct_plain.c (modified) (5 diffs)

src/spectral/dct_plain.c

@@ -32 +32 @@
 };
 
+void del_aubio_dct_plain (aubio_dct_plain_t *s);
+
 aubio_dct_plain_t * new_aubio_dct_plain (uint_t size) {
   aubio_dct_plain_t * s = AUBIO_NEW(aubio_dct_plain_t);
@@ -38 +40 @@
   if (aubio_is_power_of_two (size) == 1 && size > 16) {
     AUBIO_WRN("dct_plain: using plain dct but size %d is a power of two\n", size);
+  }
+  if ((sint_t)size <= 0) {
+    AUBIO_ERR("dct_plain: can only create with size > 0, requested %d\n",
+        size);
+    goto failure;
   }
 
@@ -69 +76 @@
   }
   return s;
+failure:
+  del_aubio_dct_plain(s);
+  return NULL;
 }
 
 void del_aubio_dct_plain (aubio_dct_plain_t *s) {
-  del_fmat(s->dct_coeffs);
-  del_fmat(s->idct_coeffs);
+  if (s->dct_coeffs)
+    del_fmat(s->dct_coeffs);
+  if (s->idct_coeffs)
+    del_fmat(s->idct_coeffs);
   AUBIO_FREE(s);
 }
@@ -79 +91 @@
 void aubio_dct_plain_do(aubio_dct_plain_t *s, const fvec_t *input, fvec_t *output) {
   if (input->length != output->length || input->length != s->size) {
-    AUBIO_WRN("dct_plain: using input length %d, but output length = %d and size = %d",
+    AUBIO_WRN("dct_plain: using input length %d, but output length = %d and size = %d\n",
         input->length, output->length, s->size);
   }
@@ -87 +99 @@
 void aubio_dct_plain_rdo(aubio_dct_plain_t *s, const fvec_t *input, fvec_t *output) {
   if (input->length != output->length || input->length != s->size) {
-    AUBIO_WRN("dct_plain: using input length %d, but output length = %d and size = %d",
+    AUBIO_WRN("dct_plain: using input length %d, but output length = %d and size = %d\n",
         input->length, output->length, s->size);
   }