summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2008-03-18 15:13:07 +0000
committerJoshua Colp <jcolp@digium.com>2008-03-18 15:13:07 +0000
commit760fc3403c7355fa05bc1b7470405239aad7af8e (patch)
treebeb50e031584cb8c2a22e67052cbcbae2d03fe37
parent5900cd90479c6f72549d91c8d7eccbd797cd32d5 (diff)
Make sure values are interpreted as character strings and not format strings.
(AST-2008-004) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109396 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/logger.c2
-rw-r--r--main/manager.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/logger.c b/main/logger.c
index b0b728b78..072a23bb2 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 7633b6e3f..1d4ff1857 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2051,7 +2051,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);