Merged revisions 138023 via svnmerge from

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

........
r138023 | tilghman | 2008-08-15 09:51:12 -0500 (Fri, 15 Aug 2008) | 8 lines

Additional check for more string specifiers than arguments.
(closes issue #13299)
 Reported by: adomjan
 Patches: 
       20080813__bug13299.diff.txt uploaded by Corydon76 (license 14)
       func_strings.c-sprintf.patch uploaded by adomjan (license 487)
 Tested by: adomjan

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138024 65c4cc65-6c06-0410-ace0-fbb531ad65f3

funcs/func_strings.c

@@ -496,10 +496,15 @@ static int acf_sprintf(struct ast_channel *chan, const char *cmd, char *data, ch
 				formatbuf[&arg.format[i] - formatstart + 1] = '\0';
 
 				/* Convert the argument into the required type */
+				if (arg.var[argcount]) {
 					if (sscanf(arg.var[argcount++], "%d", &tmpi) != 1) {
 						ast_log(LOG_ERROR, "Argument '%s' is not an integer number for format '%s'\n", arg.var[argcount - 1], formatbuf);
 						goto sprintf_fail;
 					}
+				} else {
+					ast_log(LOG_ERROR, "SPRINTF() has more format specifiers than arguments!\n");
+					goto sprintf_fail;
+				}
 
 				/* Format the argument */
 				snprintf(bufptr, buf + len - bufptr, formatbuf, tmpi);
@@ -514,10 +519,15 @@ static int acf_sprintf(struct ast_channel *chan, const char *cmd, char *data, ch
 				formatbuf[&arg.format[i] - formatstart + 1] = '\0';
 
 				/* Convert the argument into the required type */
+				if (arg.var[argcount]) {
 					if (sscanf(arg.var[argcount++], "%lf", &tmpd) != 1) {
 						ast_log(LOG_ERROR, "Argument '%s' is not a floating point number for format '%s'\n", arg.var[argcount - 1], formatbuf);
 						goto sprintf_fail;
 					}
+				} else {
+					ast_log(LOG_ERROR, "SPRINTF() has more format specifiers than arguments!\n");
+					goto sprintf_fail;
+				}
 
 				/* Format the argument */
 				snprintf(bufptr, buf + len - bufptr, formatbuf, tmpd);
@@ -562,6 +572,7 @@ static int acf_sprintf(struct ast_channel *chan, const char *cmd, char *data, ch
 			}
 		}
 	}
+	*bufptr = '\0';
 	return 0;
 sprintf_fail:
 	return -1;