From 8e7ad98e63d36c11728626e5edb6d25d505ddd1f Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 18 Mar 2008 15:16:14 +0000
Subject: [PATCH] Merged revisions 109396 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r109396 | file | 2008-03-18 12:13:07 -0300 (Tue, 18 Mar 2008) | 3 lines

Make sure values are interpreted as character strings and not format strings.
(AST-2008-004)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109398 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/logger.c  | 2 +-
 main/manager.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/logger.c b/main/logger.c
index b0b728b78a..072a23bb28 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -1145,7 +1145,7 @@ void ast_verbose(const char *fmt, ...)
 
 	strcpy(logmsg->str, buf->str);
 
-	ast_log(LOG_VERBOSE, logmsg->str);
+	ast_log(LOG_VERBOSE, "%s", logmsg->str);
 
 	/* Set type */
 	logmsg->type = LOGMSG_VERBOSE;
diff --git a/main/manager.c b/main/manager.c
index da57f200c0..3633c131a6 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1982,7 +1982,7 @@ static int action_command(struct mansession *s, const struct message *m)
 			term_strip(final_buf, buf, l);
 			final_buf[l] = '\0';
 		}
-		astman_append(s, S_OR(final_buf, buf));
+		astman_append(s, "%s", S_OR(final_buf, buf));
 		ast_free(buf);
 	}
 	close(fd);