From 70c5ac6635062efe03b51fb6c7afd30c22028be9 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Tue, 17 Apr 2012 18:29:51 +0000 Subject: 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 --- formats/format_wav.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'formats/format_wav.c') diff --git a/formats/format_wav.c b/formats/format_wav.c index df09db353..ca12ca47b 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -468,7 +468,7 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence) 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 wav filestream %p: %s\n", fs, strerror(errno)); return -1; } -- cgit v1.2.3