Changeset 0850e54 for src

Timestamp:

Dec 15, 2018, 11:49:41 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

40bdc14

Parents:

7107ed9

Message:

[io] ensure fwrite are successful in sink_vorbis

File:

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

src/io/sink_vorbis.c

@@ -110 +110 @@
 
   s->fid = fopen((const char *)s->path, "wb");
-  if (!s->fid) return AUBIO_FAIL;
+  if (!s->fid) {
+    AUBIO_ERR("sink_vorbis: Error opening file %s (%s)\n",
+        s->path, strerror(errno));
+    return AUBIO_FAIL;
+  }
 
   vorbis_info_init(&s->vi);
@@ -134 +138 @@
   {
     int ret = 0;
+    size_t wrote;
     ogg_packet header;
     ogg_packet header_comm;
@@ -150 +155 @@
       ret = ogg_stream_flush(&s->os, &s->og);
       if (ret==0) break;
-      fwrite(s->og.header, 1, s->og.header_len, s->fid);
-      fwrite(s->og.body,   1, s->og.body_len,   s->fid);
+      wrote = fwrite(s->og.header, 1, s->og.header_len, s->fid);
+      ret = (wrote == (unsigned)s->og.header_len);
+      wrote = fwrite(s->og.body,   1, s->og.body_len,   s->fid);
+      ret &= (wrote == (unsigned)s->og.body_len);
+      if (ret == 0) {
+        AUBIO_ERR("sink_vorbis: failed writing \'%s\' to disk (%s)\n",
+            s->path, strerror(errno));
+        return AUBIO_FAIL;
+      }
     }
   }
@@ -195 +207 @@
 void aubio_sink_vorbis_write(aubio_sink_vorbis_t *s)
 {
+  int result;
+  size_t wrote;
   // pre-analysis
   while (vorbis_analysis_blockout(&s->vd, &s->vb) == 1) {
@@ -206 +220 @@
 
       while (1) {
-        int result = ogg_stream_pageout (&s->os, &s->og);
+        result = ogg_stream_pageout (&s->os, &s->og);
         if (result == 0) break;
-        fwrite(s->og.header, 1, s->og.header_len, s->fid);
-        fwrite(s->og.body,   1, s->og.body_len,   s->fid);
+        wrote = fwrite(s->og.header, 1, s->og.header_len, s->fid);
+        result = (wrote == (unsigned)s->og.header_len);
+        wrote = fwrite(s->og.body, 1, s->og.body_len,     s->fid);
+        result &= (wrote == (unsigned)s->og.body_len);
+        if (result == 0) {
+          AUBIO_WRN("sink_vorbis: failed writing \'%s\' to disk (%s)\n",
+              s->path, strerror(errno));
+        }
         if (ogg_page_eos(&s->og)) break;
       }