Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not

actual problems, per se.  I also added format attributes to any printf wrapper functions I found that didn't have them.  -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@109447 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 14 insertions, 11 deletions

diff --git a/utils/astman.c b/utils/astman.c
index 06fe8b3ad..2a4508589 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -141,7 +141,8 @@ static void del_chan(char *name)
 	AST_LIST_TRAVERSE_SAFE_END;
 }
 
-static void fdprintf(int fd, char *fmt, ...)
+
+static void __attribute__((format (printf, 2, 3))) fdprintf(int fd, char *fmt, ...)
 {
 	char stuff[4096];
 	va_list ap;
@@ -406,7 +407,8 @@ static struct message *wait_for_response(int timeout)
 	return NULL;
 }
 
-static int manager_action(char *action, char *fmt, ...)
+
+static int __attribute__((format (printf, 2, 3))) manager_action(char *action, char *fmt, ...)
 {
 	struct ast_mansession *s;
 	char tmp[4096];
@@ -465,7 +467,7 @@ static int hide_doing(void)
 static void try_status(void)
 {
 	struct message *m;
-	manager_action("Status", "");
+	manager_action("Status", "%s", "");
 	m = wait_for_response(10000);
 	if (!m) {
 		show_message("Status Failed", "Timeout waiting for response");
diff --git a/utils/check_expr.c b/utils/check_expr.c
index 009fe8673..260fd4e2e 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -40,7 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  *	ast_str_set_va(...)
  *	ast_str_append_va(...)
  */
-int __ast_str_helper(struct ast_str **buf, size_t max_len,
+int __attribute__((format (printf, 4, 0))) __ast_str_helper(struct ast_str **buf, size_t max_len,
 	int append, const char *fmt, va_list ap)
 {
 	int res, need;
diff --git a/utils/extconf.c b/utils/extconf.c
index 4ff6e1dc0..5934b5c8c 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -1078,6 +1078,7 @@ char * attribute_malloc _ast_strndup(const char *str, size_t len, const char *fi
 	_ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__)
 
 AST_INLINE_API(
+__attribute__((format (printf, 5, 6)))
 int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
 {
 	int res;
@@ -1104,6 +1105,7 @@ int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, co
 	_ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap))
 
 AST_INLINE_API(
+__attribute__((format (printf, 5, 0)))
 int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
 {
 	int res;
@@ -2733,7 +2735,7 @@ static void ast_log(int level, const char *file, int line, const char *function,
 	va_end(vars);
 }
 
-static void ast_verbose(const char *fmt, ...)
+static void __attribute__((format (printf, 1, 2))) ast_verbose(const char *fmt, ...)
 {
 	va_list vars;
 	va_start(vars,fmt);
diff --git a/utils/frame.c b/utils/frame.c
index 7fdb1637d..5aadb9687 100644
--- a/utils/frame.c
+++ b/utils/frame.c
@@ -910,7 +910,7 @@ int workloop( FILE *theinfile, FILE *theoutfile,
   return TRUE;      /* Input file done with, no errors. */
 }
 
-int chat( const char *format, ...)
+int __attribute__((format (printf,1,2))) chat( const char *format, ...)
 {
     va_list ap;
     int result = 0;
@@ -924,8 +924,7 @@ int chat( const char *format, ...)
     return result;
 }
 
-
-int inform( const char *format, ...)
+int __attribute__((format (printf,1,2))) inform( const char *format, ...)
 {
     va_list ap;
     int result = 0;
@@ -939,7 +938,7 @@ int inform( const char *format, ...)
     return result;
 }
 
-int error( const char *format, ...)
+int __attribute__((format (printf,1,2))) error( const char *format, ...)
 {
     va_list ap;
     int result;
@@ -950,7 +949,7 @@ int error( const char *format, ...)
     return result;
 }
 
-void fatalerror( const char *format, ...)
+void __attribute__((format (printf,1,2))) fatalerror( const char *format, ...)
 {
     va_list ap;
 
@@ -966,7 +965,7 @@ void fatalperror( const char *string)
   myexit( 1);
 }
 
-int say( const char *format, ...)
+int __attribute__((format (printf,1,2))) say( const char *format, ...)
 {
     va_list ap;
     int result;