cleanup: Fix fread() and fwrite() error handling
authorSean Bright <sean.bright@gmail.com>
Fri, 21 Apr 2017 17:04:44 +0000 (13:04 -0400)
committerSean Bright <sean.bright@gmail.com>
Tue, 25 Apr 2017 21:24:15 +0000 (16:24 -0500)
Cleaned up some of the incorrect uses of fread() and fwrite(), mostly in
the format modules. Neither of these functions will ever return a value
less than 0, which we were checking for in some cases.

I've introduced a fair amount of duplication in the format modules, but
I plan to change how format modules work internally in a subsequent
patch set, so this is simply a stop-gap.

Change-Id: I8ca1cd47c20b2c0b72088bd13b9046f6977aa872

19 files changed:
addons/format_mp3.c
apps/app_minivm.c
apps/app_voicemail.c
formats/format_g719.c
formats/format_g723.c
formats/format_g726.c
formats/format_g729.c
formats/format_gsm.c
formats/format_h263.c
formats/format_h264.c
formats/format_ilbc.c
formats/format_ogg_vorbis.c
formats/format_pcm.c
formats/format_siren14.c
formats/format_siren7.c
formats/format_sln.c
formats/format_vox.c
formats/format_wav.c
formats/format_wav_gsm.c

index e0f57b8..bb0b208 100644 (file)
@@ -118,9 +118,11 @@ static int mp3_squeue(struct ast_filestream *s)
 
        res = ftell(s->f);
        p->sbuflen = fread(p->sbuf, 1, MP3_SCACHE, s->f);
-       if(p->sbuflen < 0) {
-               ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", p->sbuflen, strerror(errno));
-               return -1;
+       if (p->sbuflen < MP3_SCACHE) {
+               if (ferror(s->f)) {
+                       ast_log(LOG_WARNING, "Error while reading MP3 file: %s\n", strerror(errno));
+                       return -1;
+               }
        }
        res = decodeMP3(&p->mp,p->sbuf,p->sbuflen,p->dbuf,MP3_DCACHE,&p->dbuflen);
        if(res != MP3_OK)
index 4cc2f47..ff9ab34 100644 (file)
@@ -854,16 +854,16 @@ static int b64_inbuf(struct b64_baseio *bio, FILE *fi)
        if (bio->ateof)
                return 0;
 
-       if ((l = fread(bio->iobuf, 1, B64_BASEMAXINLINE,fi)) <= 0) {
-               if (ferror(fi))
-                       return -1;
-
+       if ((l = fread(bio->iobuf, 1, B64_BASEMAXINLINE, fi)) != B64_BASEMAXINLINE) {
                bio->ateof = 1;
-               return 0;
+               if (l == 0) {
+                       /* Assume EOF */
+                       return 0;
+               }
        }
 
-       bio->iolen= l;
-       bio->iocp= 0;
+       bio->iolen = l;
+       bio->iocp = 0;
 
        return 1;
 }
index de82670..06f4830 100644 (file)
@@ -2728,9 +2728,9 @@ static int imap_store_file(const char *dir, const char *mailboxuser, const char
                        *(vmu->email) = '\0';
                return -1;
        }
-       if (fread(buf, len, 1, p) < len) {
+       if (fread(buf, 1, len, p) != len) {
                if (ferror(p)) {
-                       ast_log(LOG_ERROR, "Short read while reading in mail file.\n");
+                       ast_log(LOG_ERROR, "Error while reading mail file: %s\n");
                        return -1;
                }
        }
@@ -4743,12 +4743,12 @@ static int inbuf(struct baseio *bio, FILE *fi)
        if (bio->ateof)
                return 0;
 
-       if ((l = fread(bio->iobuf, 1, BASEMAXINLINE, fi)) <= 0) {
-               if (ferror(fi))
-                       return -1;
-
+       if ((l = fread(bio->iobuf, 1, BASEMAXINLINE, fi)) != BASEMAXINLINE) {
                bio->ateof = 1;
-               return 0;
+               if (l == 0) {
+                       /* Assume EOF */
+                       return 0;
+               }
        }
 
        bio->iolen = l;
index 8cc9427..572b88f 100644 (file)
@@ -45,8 +45,16 @@ static struct ast_frame *g719read(struct ast_filestream *s, int *whennext)
 
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = BYTES_TO_SAMPLES(res);
index 04e03b6..d4c4d4b 100644 (file)
@@ -64,8 +64,17 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
        }
        /* Read the data into the buffer */
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, size);
-       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != size) {
-               ast_log(LOG_WARNING, "Short read (%d of %d bytes) (%s)!\n", res, size, strerror(errno));
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = 240;
index 08e669e..7da6d1e 100644 (file)
@@ -124,8 +124,16 @@ static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size[fs->rate]);
        s->fr.samples = 8 * FRAME_TIME;
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples;
index 49e5802..4cefc04 100644 (file)
@@ -51,8 +51,16 @@ static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext)
        s->fr.samples = G729A_SAMPLES;
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res && (res != 10)) /* XXX what for ? */
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples;
index a2b6d36..39deb98 100644 (file)
@@ -55,10 +55,18 @@ static struct ast_frame *gsm_read(struct ast_filestream *s, int *whennext)
 {
        int res;
 
-       AST_FRAME_SET_BUFFER(&(s->fr), s->buf, AST_FRIENDLY_OFFSET, GSM_FRAME_SIZE)
+       AST_FRAME_SET_BUFFER(&(s->fr), s->buf, AST_FRIENDLY_OFFSET, GSM_FRAME_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, GSM_FRAME_SIZE, s->f)) != GSM_FRAME_SIZE) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), GSM_FRAME_SIZE, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = GSM_SAMPLES;
@@ -131,7 +139,7 @@ static int gsm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
                int i;
                fseeko(fs->f, 0, SEEK_END);
                for (i=0; i< (offset - max) / GSM_FRAME_SIZE; i++) {
-                       if (!fwrite(gsm_silence, 1, GSM_FRAME_SIZE, fs->f)) {
+                       if (fwrite(gsm_silence, 1, GSM_FRAME_SIZE, fs->f) != GSM_FRAME_SIZE) {
                                ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                        }
                }
index 4cc3db5..d05e598 100644 (file)
@@ -58,7 +58,7 @@ static int h263_open(struct ast_filestream *s)
 {
        unsigned int ts;
 
-       if (fread(&ts, 1, sizeof(ts), s->f) < sizeof(ts)) {
+       if (fread(&ts, 1, sizeof(ts), s->f) != sizeof(ts)) {
                ast_log(LOG_WARNING, "Empty file!\n");
                return -1;
        }
@@ -74,7 +74,7 @@ static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext)
        struct h263_desc *fs = (struct h263_desc *)s->_private;
 
        /* Send a frame from the file to the appropriate channel */
-       if ((res = fread(&len, 1, sizeof(len), s->f)) < 1)
+       if ((res = fread(&len, 1, sizeof(len), s->f)) != sizeof(len))
                return NULL;
        len = ntohs(len);
        mark = (len & FRAME_ENDED) ? 1 : 0;
@@ -85,8 +85,16 @@ static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext)
        }
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, len);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        s->fr.samples = fs->lastts;     /* XXX what ? */
index 60b0902..47f71ae 100644 (file)
@@ -50,7 +50,7 @@ struct h264_desc {
 static int h264_open(struct ast_filestream *s)
 {
        unsigned int ts;
-       if (fread(&ts, 1, sizeof(ts), s->f) < sizeof(ts)) {
+       if (fread(&ts, 1, sizeof(ts), s->f) != sizeof(ts)) {
                ast_log(LOG_WARNING, "Empty file!\n");
                return -1;
        }
@@ -66,7 +66,7 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext)
        struct h264_desc *fs = (struct h264_desc *)s->_private;
 
        /* Send a frame from the file to the appropriate channel */
-       if ((res = fread(&len, 1, sizeof(len), s->f)) < 1)
+       if ((res = fread(&len, 1, sizeof(len), s->f)) != sizeof(len))
                return NULL;
        len = ntohs(len);
        mark = (len & FRAME_ENDED) ? 1 : 0;
@@ -77,8 +77,16 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext)
        }
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, len);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d of %d) (%s)!\n", res, len, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        s->fr.samples = fs->lastts;
index eab465d..ec8ad0f 100644 (file)
@@ -49,8 +49,16 @@ static struct ast_frame *ilbc_read(struct ast_filestream *s, int *whennext)
        /* Send a frame from the file to the appropriate channel */
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, ILBC_BUF_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = ILBC_SAMPLES;
index c0f8c19..4fdd1c4 100644 (file)
@@ -181,10 +181,10 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s,
        while (!tmp->eos) {
                if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
                        break;
-               if (!fwrite(tmp->og.header, 1, tmp->og.header_len, s->f)) {
+               if (fwrite(tmp->og.header, 1, tmp->og.header_len, s->f) != tmp->og.header_len) {
                        ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                }
-               if (!fwrite(tmp->og.body, 1, tmp->og.body_len, s->f)) {
+               if (fwrite(tmp->og.body, 1, tmp->og.body_len, s->f) != tmp->og.body_len) {
                        ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                }
                if (ogg_page_eos(&tmp->og))
@@ -211,10 +211,10 @@ static void write_stream(struct ogg_vorbis_desc *s, FILE *f)
                                if (ogg_stream_pageout(&s->os, &s->og) == 0) {
                                        break;
                                }
-                               if (!fwrite(s->og.header, 1, s->og.header_len, f)) {
-                               ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+                               if (fwrite(s->og.header, 1, s->og.header_len, f) != s->og.header_len) {
+                                       ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                                }
-                               if (!fwrite(s->og.body, 1, s->og.body_len, f)) {
+                               if (fwrite(s->og.body, 1, s->og.body_len, f) != s->og.body_len) {
                                        ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                                }
                                if (ogg_page_eos(&s->og)) {
index 97af0e9..f5ddda9 100644 (file)
@@ -83,9 +83,17 @@ static struct ast_frame *pcm_read(struct ast_filestream *s, int *whennext)
        /* Send a frame from the file to the appropriate channel */
 
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
-       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        s->fr.datalen = res;
@@ -140,9 +148,10 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
                const char *src = (ast_format_cmp(fs->fmt->format, ast_format_alaw) == AST_FORMAT_CMP_EQUAL) ? alaw_silence : ulaw_silence;
 
                while (left) {
-                       size_t written = fwrite(src, 1, (left > BUF_SIZE) ? BUF_SIZE : left, fs->f);
-                       if (written == -1)
+                       size_t written = fwrite(src, 1, MIN(left, BUF_SIZE), fs->f);
+                       if (written < MIN(left, BUF_SIZE)) {
                                break;  /* error */
+                       }
                        left -= written;
                }
                ret = 0; /* successful */
@@ -210,7 +219,10 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f)
                                to_write = fpos - cur;
                                if (to_write > sizeof(buf))
                                        to_write = sizeof(buf);
-                               fwrite(buf, 1, to_write, fs->f);
+                               if (fwrite(buf, 1, to_write, fs->f) != to_write) {
+                                       ast_log(LOG_ERROR, "Failed to write to file: %s\n", strerror(errno));
+                                       return -1;
+                               }
                                cur += to_write;
                        }
                }
index 1ce7d18..d54ed99 100644 (file)
@@ -45,8 +45,16 @@ static struct ast_frame *siren14read(struct ast_filestream *s, int *whennext)
 
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = BYTES_TO_SAMPLES(res);
index d205984..f3b4b42 100644 (file)
@@ -45,8 +45,16 @@ static struct ast_frame *siren7read(struct ast_filestream *s, int *whennext)
 
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
        if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = BYTES_TO_SAMPLES(res);
index af3f691..1977f7d 100644 (file)
@@ -38,9 +38,17 @@ static struct ast_frame *generic_read(struct ast_filestream *s, int *whennext, u
        /* Send a frame from the file to the appropriate channel */
 
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, buf_size);
-       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = res/2;
index 5a70c34..195714c 100644 (file)
@@ -44,9 +44,17 @@ static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext)
 
        /* Send a frame from the file to the appropriate channel */
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
-       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples = res * 2;
index 8316c35..09e6a53 100644 (file)
@@ -361,7 +361,7 @@ static void wav_close(struct ast_filestream *s)
 
        /* Pad to even length */
        if (fs->bytes & 0x1) {
-               if (!fwrite(&zero, 1, 1, s->f)) {
+               if (fwrite(&zero, 1, 1, s->f) != 1) {
                        ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                }
        }
@@ -385,14 +385,23 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
        here = ftello(s->f);
        if (fs->maxlen - here < bytes)          /* truncate if necessary */
                bytes = fs->maxlen - here;
-       if (bytes < 0)
-               bytes = 0;
+       if (bytes <= 0) {
+               return NULL;
+       }
 /*     ast_debug(1, "here: %d, maxlen: %d, bytes: %d\n", here, s->maxlen, bytes); */
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, bytes);
-       
-       if ( (res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) <= 0 ) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (feof(s->f)) {
+                       if (res) {
+                               ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                               "(expected %d bytes, read %d)\n",
+                                               ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
+                       }
+               } else {
+                       ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), strerror(errno));
+               }
                return NULL;
        }
        s->fr.datalen = res;
index eef06ce..bfec903 100644 (file)
@@ -422,8 +422,16 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
                int res;
                
                if ((res = fread(msdata, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) {
-                       if (res && (res != 1))
-                               ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+                       if (feof(s->f)) {
+                               if (res) {
+                                       ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
+                                                       "(expected %d bytes, read %d)\n",
+                                                       ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res);
+                               }
+                       } else {
+                               ast_log(LOG_ERROR, "Error while reading %s file: %s\n",
+                                               ast_format_get_name(s->fr.subclass.format), strerror(errno));
+                       }
                        return NULL;
                }
                /* Convert from MS format to two real GSM frames */
@@ -511,7 +519,7 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
                int i;
                fseek(fs->f, 0, SEEK_END);
                for (i=0; i< (offset - max) / MSGSM_FRAME_SIZE; i++) {
-                       if (!fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f)) {
+                       if (fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f) != MSGSM_FRAME_SIZE) {
                                ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                        }
                }