Changeset 387b605 for tests/src/io

Timestamp:

Dec 19, 2018, 2:49:22 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/timestretch, fix/ffmpeg5, master

Children:

43ea60d

Parents:

7b5e1a5

Message:

[tests] avoid test-sink crash on missing input file

Location:

tests/src/io

Files:

• base-sink_custom.h (modified) (1 diff)
• test-sink.c (modified) (1 diff)

tests/src/io/base-sink_custom.h

@@ -26 +26 @@
   char_t *sink_path = argv[2];
 
+  aubio_source_t *i = NULL;
+  aubio_sink_custom_t *o = NULL;
+
   if ( argc >= 4 ) samplerate = atoi(argv[3]);
   if ( argc >= 5 ) hop_size = atoi(argv[4]);
 
   fvec_t *vec = new_fvec(hop_size);
+  if (!vec) { err = 1; goto failure; }
 
-  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
+  i = new_aubio_source(source_path, samplerate, hop_size);
+  if (!i) { err = 1; goto failure; }
   if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
 
-  aubio_sink_custom_t *o = new_aubio_sink_custom(sink_path, samplerate);
-
-  if (!vec || !i || !o) { err = 1; goto failure; }
+  o = new_aubio_sink_custom(sink_path, samplerate);
+  if (!o) { err = 1; goto failure; }
 
   do {

tests/src/io/test-sink.c

@@ -22 +22 @@
   char_t *sink_path = argv[2];
 
+  aubio_source_t *i = NULL;
+  aubio_sink_t *o = NULL;
+
   if ( argc >= 4 ) samplerate = atoi(argv[3]);
   if ( argc >= 5 ) hop_size = atoi(argv[4]);
 
   fvec_t *vec = new_fvec(hop_size);
+  if (!vec) { err = 1; goto failure; }
 
-  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
+  i = new_aubio_source(source_path, samplerate, hop_size);
+  if (!i) { err = 1; goto failure; }
   if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
 
-  aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);
-
-  if (!vec || !i || !o) { err = 1; goto failure; }
+  o = new_aubio_sink(sink_path, samplerate);
+  if (!o) { err = 1; goto failure; }
 
   do {