From: Matthew Nicholson <mnicholson@digium.com>
Date: Fri, 8 Jan 2010 19:34:03 +0000 (+0000)
Subject: Merged revisions 238630 via svnmerge from
X-Git-Tag: 1.6.0.23~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a28e14377405877eafcf10968620fbeab9da43;p=thirdparty%2Fasterisk.git

Merged revisions 238630 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines

  Merged revisions 238629 via svnmerge from
  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/branches/1.6.0@238633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/file.c b/main/file.c
index 2bca648716..6dcc3b4522 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1344,6 +1344,7 @@ char *ast_format_str_reduce(char *fmts)
 	char *orig = fmts;
 	int i, j, x, first, found = 0;
 	int len = strlen(fmts) + 1;
+	int res;
 
 	if (AST_RWLIST_RDLOCK(&formats)) {
 		ast_log(LOG_WARNING, "Unable to lock format list\n");
@@ -1379,8 +1380,9 @@ char *ast_format_str_reduce(char *fmts)
 
 		/* special handling for the first entry */
 		if (first) {
-			fmts += snprintf(fmts, len, "%s", fmts_str[i]);
-			len -= (fmts - orig);
+			res = snprintf(fmts, len, "%s", fmts_str[i]);
+			fmts += res;
+			len -= res;
 			first = 0;
 			continue;
 		}
@@ -1395,8 +1397,9 @@ char *ast_format_str_reduce(char *fmts)
 		}
 
 		if (!found) {
-			fmts += snprintf(fmts, len, "|%s", fmts_str[i]);
-			len -= (fmts - orig);
+			res = snprintf(fmts, len, "|%s", fmts_str[i]);
+			fmts += res;
+			len -= res;
 		}
 	}