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_g719.c | 2 +- formats/format_gsm.c | 2 +- formats/format_pcm.c | 4 ++-- formats/format_siren14.c | 2 +- formats/format_siren7.c | 2 +- formats/format_sln.c | 2 +- formats/format_vox.c | 2 +- formats/format_wav.c | 2 +- formats/format_wav_gsm.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'formats') diff --git a/formats/format_g719.c b/formats/format_g719.c index 903fbcde9..0a0eea170 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -92,7 +92,7 @@ static int g719seek(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 g719 filestream %p: %s\n", fs, strerror(errno)); return -1; } diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 4cf6579a6..26306806c 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -120,7 +120,7 @@ static int gsm_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 g719 filestream %p: %s\n", fs, strerror(errno)); return -1; } diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 2a740ef5d..f65a6202f 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -115,7 +115,7 @@ static int pcm_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 pcm filestream %p: %s\n", fs, strerror(errno)); return -1; } @@ -414,7 +414,7 @@ static int au_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 au filestream %p: %s\n", fs, strerror(errno)); return -1; } diff --git a/formats/format_siren14.c b/formats/format_siren14.c index 08c2cbfbf..f3e53e795 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -92,7 +92,7 @@ static int siren14seek(struct ast_filestream *fs, off_t sample_offset, int whenc 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 siren14 filestream %p: %s\n", fs, strerror(errno)); return -1; } diff --git a/formats/format_siren7.c b/formats/format_siren7.c index 955323ed2..a07144bfc 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -92,7 +92,7 @@ static int siren7seek(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 siren7 filestream %p: %s\n", fs, strerror(errno)); return -1; } 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; } diff --git a/formats/format_vox.c b/formats/format_vox.c index bfa0d8e4c..3f3b1eabb 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -90,7 +90,7 @@ static int vox_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 g719 filestream %p: %s\n", fs, strerror(errno)); return -1; } 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; } diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index bbf3339bc..e4c5051a2 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -489,7 +489,7 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence) } /* XXX ideally, should round correctly */ - 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