Changeset af86999 for src/io/source_sndfile.c

Timestamp:

Jul 14, 2012, 8:39:09 PM (12 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:

2c3d4ca

Parents:

6192ce7

Message:

src/io/source_sndfile.c: return NULL before trying to allocate memory, clean up

File:

• src/io/source_sndfile.c (modified) (3 diffs)

src/io/source_sndfile.c

@@ -29 +29 @@
 #include "source_sndfile.h"
 #include "fvec.h"
-#include "mathutils.h"
 
 #define MAX_CHANNELS 6
@@ -87 +86 @@
   
   s->scratch_size = s->hop_size*s->input_channels;
-  s->scratch_data = AUBIO_ARRAY(float,s->scratch_size);
-
   /* allocate data for de/interleaving reallocated when needed. */
   if (s->scratch_size >= MAX_SIZE * MAX_CHANNELS) {
-    AUBIO_ERR("%d exceeds maximum aubio_source_sndfile buffer size %d\n", s->scratch_size, MAX_CHANNELS * MAX_CHANNELS);
+    AUBIO_ERR("%d x %d exceeds maximum aubio_source_sndfile buffer size %d\n",
+        s->hop_size, s->input_channels, MAX_CHANNELS * MAX_CHANNELS);
     return NULL;
   }
+  s->scratch_data = AUBIO_ARRAY(float,s->scratch_size);
 
   return s;
@@ -102 +101 @@
   int i,j, input_channels = s->input_channels;
   int aread;
-  smpl_t *pread;        
-
   /* do actual reading */
   read_frames = sf_read_float (s->handle, s->scratch_data, s->scratch_size);