diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-04-21 13:04:44 -0400 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-04-25 16:24:15 -0500 |
| commit | f5b67871df566ddc0f0b6ad22d81a81d8ecce7d7 (patch) | |
| tree | 3b45a52fa39a04fc670f1efee2ec1099a56733e7 /addons | |
| parent | 8df729517e32926ea33aa3a40d5abcbf39488e3a (diff) | |
cleanup: Fix fread() and fwrite() error handling
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
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/format_mp3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/format_mp3.c b/addons/format_mp3.c index e0f57b86b..bb0b20850 100644 --- a/addons/format_mp3.c +++ b/addons/format_mp3.c @@ -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) |