kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-04 05:55:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix error that caused truncate operations to fail

Browse Source 
Another very inappropriate placement of a ')' (again introduced in r362151)
caused the various truncate operations to attempt to truncate the sound file
at a position of '0'.

(issue ASTERISK-19655)
Reported by: Matt Jordan

(issue ASTERISK-19810)
Reported by: colbec


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@364578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-04-29 19:31:55 +00:00
parent 139a7459cd
commit f248f6eb71
15 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
formats/format_g719.c
+1 -1
View File
@@ -122,7 +122,7 @@ static int g719trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g719 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in g719 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_g723.c
+1 -1
View File
@@ -125,7 +125,7 @@ static int g723_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g723 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in g723 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_g729.c
+1 -1
View File
@@ -120,7 +120,7 @@ static int g729_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for g729 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in g729 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_gsm.c
+1 -1
View File
@@ -160,7 +160,7 @@ static int gsm_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for gsm filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in gsm filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_h263.c
+1 -1
View File
@@ -156,7 +156,7 @@ static int h263_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for h263 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in h263 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_h264.c
+1 -1
View File
@@ -145,7 +145,7 @@ static int h264_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for h264 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in h264 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_ilbc.c
+1 -1
View File
@@ -118,7 +118,7 @@ static int ilbc_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for iLBC filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in iLBC filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_pcm.c
+2 -2
View File
@@ -168,7 +168,7 @@ static int pcm_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for pcm filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in pcm filestream %p: %s\n", fs, strerror(errno));
return -1;
}
@@ -445,7 +445,7 @@ static int au_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for au filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in au filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_siren14.c
+1 -1
View File
@@ -122,7 +122,7 @@ static int siren14trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for siren14 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in siren14 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_siren7.c
+1 -1
View File
@@ -122,7 +122,7 @@ static int siren7trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for siren7 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in siren7 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_sln.c
+1 -1
View File
@@ -118,7 +118,7 @@ static int slinear_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for sln filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in sln filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_sln16.c
+1 -1
View File
@@ -122,7 +122,7 @@ static int slinear_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for sln16 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in sln16 filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_vox.c
+1 -1
View File
@@ -120,7 +120,7 @@ static int vox_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for vox filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in vox filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_wav.c
+1 -1
View File
@@ -496,7 +496,7 @@ static int wav_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for wav filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in wav filestream %p: %s\n", fs, strerror(errno));
return -1;
}
formats/format_wav_gsm.c
+1 -1
View File
@@ -530,7 +530,7 @@ static int wav_trunc(struct ast_filestream *fs)
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for WAV filestream %p: %s\n", fs, strerror(errno));
return -1;
}
if ((cur = ftello(fs->f) < 0)) {
if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in WAV filestream %p: %s\n", fs, strerror(errno));
return -1;
}