kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 238629 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines
  
  Properly calculate the remaining space in the output string when reducing format strings.
  
  (closes issue #16560)
  Reported by: goldwein
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@238630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-01-08 19:32:11 +00:00
parent 7df5564a61
commit 98b69d84e1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/file.c
View File

@@ -1356,6 +1356,7 @@ char *ast_format_str_reduce(char *fmts)
char *orig = fmts; char *orig = fmts;
int i, j, x, first, found = 0; int i, j, x, first, found = 0;
int len = strlen(fmts) + 1; int len = strlen(fmts) + 1;
int res;
if (AST_RWLIST_RDLOCK(&formats)) { if (AST_RWLIST_RDLOCK(&formats)) {
ast_log(LOG_WARNING, "Unable to lock format list\n"); ast_log(LOG_WARNING, "Unable to lock format list\n");
@@ -1391,8 +1392,9 @@ char *ast_format_str_reduce(char *fmts)
/* special handling for the first entry */ /* special handling for the first entry */
if (first) { if (first) {
fmts += snprintf(fmts, len, "%s", fmts_str[i]); res = snprintf(fmts, len, "%s", fmts_str[i]);
len -= (fmts - orig); fmts += res;
len -= res;
first = 0; first = 0;
continue; continue;
} }
@@ -1407,8 +1409,9 @@ char *ast_format_str_reduce(char *fmts)
} }
if (!found) { if (!found) {
fmts += snprintf(fmts, len, "|%s", fmts_str[i]); res = snprintf(fmts, len, "|%s", fmts_str[i]);
len -= (fmts - orig); fmts += res;
len -= res;
} }
} }