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:37 -0500 |
| commit | 1b50df78d069632e5607e2937461a33d7f568431 (patch) | |
| tree | e9768588d01be3d2a2c1de11821fe59b138e5000 /formats/format_h263.c | |
| parent | f7ca69809a0c39be4cf42844c7d7d474e68d8305 (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 'formats/format_h263.c')
| -rw-r--r-- | formats/format_h263.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/formats/format_h263.c b/formats/format_h263.c index 67f126927..5c23923b7 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -60,7 +60,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; } @@ -76,7 +76,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; @@ -87,8 +87,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 ? */ |