Changeset 68b991e for src/io

Timestamp:

Dec 17, 2018, 4:41:01 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

41d14b8

Parents:

0440778

Message:

[io] sink_flac: validate input sizes, avoid crash on null path and closing twice

File:

• src/io/sink_flac.c (modified) (10 diffs)

src/io/sink_flac.c

@@ -35 +35 @@
 #include <FLAC/stream_encoder.h>
 
-#include <vorbis/vorbisenc.h>
 #include <string.h> // strerror
 #include <errno.h> // errno
@@ -79 +78 @@
 
 #if 0
-static void aubio_sink_vorbis_callback(const FLAC__StreamEncoder* encoder,
+static void aubio_sink_flac_callback(const FLAC__StreamEncoder* encoder,
     FLAC__uint64 bytes_written, FLAC__uint64 samples_written,
     unsigned frames_writtten, unsigned total_frames_estimate,
@@ -89 +88 @@
 {
   aubio_sink_flac_t * s = AUBIO_NEW(aubio_sink_flac_t);
+
+  if (!uri) {
+    AUBIO_ERROR("sink_flac: Aborted opening null path\n");
+    goto failure;
+  }
 
   s->path = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX) + 1);
@@ -196 +200 @@
   init_status = FLAC__stream_encoder_init_file(s->encoder, s->path,
       NULL, NULL);
-      //aubio_sink_vorbis_callback, s);
+      //aubio_sink_flac_callback, s);
   if (init_status == FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE) {
     AUBIO_ERR("sink_flac: failed initilizing encoder for %s"
@@ -259 +263 @@
 {
   uint_t c, v;
+  uint_t length = aubio_sink_validate_input_length("sink_flac", s->path,
+      MAX_WRITE_SIZE, write_data->length, write);
   // fill buffer
   if (!write) {
     return;
-  } else if (write > MAX_WRITE_SIZE) {
-    AUBIO_ERR("sink_flac: max_write request %dm asked for %d,"
-       " failed writing to %s\n", write, MAX_WRITE_SIZE, s->path);
-    return;
   } else {
     for (c = 0; c < s->channels; c++) {
-      for (v = 0; v < write; v++) {
+      for (v = 0; v < length; v++) {
         s->buffer[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[v]);
       }
@@ -275 +277 @@
   // send to encoder
   FLAC__stream_encoder_process_interleaved(s->encoder,
-      (const FLAC__int32*)s->buffer, write);
+      (const FLAC__int32*)s->buffer, length);
 }
 
@@ -282 +284 @@
 {
   uint_t c, v;
-  uint_t channels = MIN(s->channels, write_data->height);
+  uint_t channels = aubio_sink_validate_input_channels("sink_flac", s->path,
+      s->channels, write_data->height);
+  uint_t length = aubio_sink_validate_input_length("sink_flac", s->path,
+      MAX_WRITE_SIZE, write_data->length, write);
   // fill buffer
   if (!write) {
     return;
-  } else if (write > MAX_WRITE_SIZE) {
-    AUBIO_ERR("sink_flac: max_write request %dm asked for %d,"
-       " failed writing to %s\n", write, MAX_WRITE_SIZE, s->path);
-    return;
   } else {
     for (c = 0; c < channels; c++) {
-      for (v = 0; v < write; v++) {
+      for (v = 0; v < length; v++) {
         s->buffer[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[c][v]);
       }
@@ -298 +299 @@
     // send to encoder
     FLAC__stream_encoder_process_interleaved(s->encoder,
-        (const FLAC__int32*)s->buffer, write);
+        (const FLAC__int32*)s->buffer, length);
   }
 }
@@ -305 +306 @@
 {
   uint_t ret = AUBIO_OK;
+
+  if (!s->fid) return AUBIO_FAIL;
 
   if (s->encoder) {
@@ -325 +328 @@
   }
 
-  if (s->fid) {
-    if (fclose(s->fid)) {
-      AUBIO_ERR("sink_flac: Error closing file %s (%s)\n",
-          s->path, strerror(errno));
-      ret &= AUBIO_FAIL;
-    }
-  }
+  if (s->fid && fclose(s->fid)) {
+    AUBIO_ERR("sink_flac: Error closing file %s (%s)\n",
+        s->path, strerror(errno));
+    ret &= AUBIO_FAIL;
+  }
+  s->fid = NULL;
+
   return ret;
 }
 
 #if 0
-static void aubio_sink_vorbis_callback(const FLAC__StreamEncoder* encoder UNUSED,
+static void aubio_sink_flac_callback(const FLAC__StreamEncoder* encoder UNUSED,
     FLAC__uint64 bytes_written, FLAC__uint64 samples_written,
     unsigned frames_written, unsigned total_frames_estimate,