diff options
author | Matthew Jordan <mjordan@digium.com> | 2012-04-17 18:29:51 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2012-04-17 18:29:51 +0000 |
commit | 70c5ac6635062efe03b51fb6c7afd30c22028be9 (patch) | |
tree | 7cb8be6e923db7822dae1b093fdb252937670553 /formats/format_sln.c | |
parent | 8337ecd38ddf144c645d8d762da3a44e4c740456 (diff) |
Fix error that caused seek format operations to set max file size to '1' or '0'
A very inappropriate placement of a ')' (introduced in r362151) caused the
maximum size of a file to be set as the result of a comparison operation, as
opposed to the result of the ftello operation. This resulted in seeking being
restricted to the beginning of the file, or 1 byte into the file. Thanks to
the Asterisk Test Suite for properly freaking out about this on at least one
test.
(issue ASTERISK-19655)
Reported by: Matt Jordan
........
Merged revisions 362304 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 362305 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats/format_sln.c')
-rw-r--r-- | formats/format_sln.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/formats/format_sln.c b/formats/format_sln.c index b90f6b27a..982054459 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -86,7 +86,7 @@ static int slinear_seek(struct ast_filestream *fs, off_t sample_offset, int when return -1; } - if ((max = ftello(fs->f) < 0)) { + if ((max = ftello(fs->f)) < 0) { ast_log(AST_LOG_WARNING, "Unable to determine max position in sln filestream %p: %s\n", fs, strerror(errno)); return -1; } |