diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 15:16:14 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 15:16:14 +0000 |
commit | 53e7e355412cafb72bf398b148867afdc407b0e4 (patch) | |
tree | 46e9fe68b42fdb11a098c7d82680092469ad768a | |
parent | 377fddb7a04df80601ca8cf2806786b6ed38196b (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@109398 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/logger.c | 2 | ||||
-rw-r--r-- | main/manager.c | 2 |
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 da57f200c..3633c131a 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); |