Changeset 6031419

Timestamp:

Dec 12, 2018, 11:25:35 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

1ba359c, 7107ed9

Parents:

2e13788

Message:

[ci] avoid read out of bound in sink_vorbis_do_multi, simplify _open

File:

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

src/io/sink_vorbis.c

@@ -107 +107 @@
   float quality_mode = .9;
 
-  if (s->samplerate == 0 || s->channels == 0)
-  {
-    AUBIO_ERR("sink_vorbis: vorbis_encode_init_vbr failed\n");
-    return AUBIO_FAIL;
-  }
+  if (s->samplerate == 0 || s->channels == 0) return AUBIO_FAIL;
 
   s->fid = fopen((const char *)s->path, "wb");
@@ -248 +244 @@
 {
   uint_t c, v;
+  uint_t channels = MIN(s->channels, write_data->height);
   float **buffer = vorbis_analysis_buffer(&s->vd, (long)write);
   // fill buffer
@@ -256 +253 @@
     return;
   } else {
-    for (c = 0; c < s->channels; c++) {
+    for (c = 0; c < channels; c++) {
       for (v = 0; v < write; v++) {
         buffer[c][v] = write_data->data[c][v];