aboutsummaryrefslogtreecommitdiffstats
path: root/main/logger.c
diff options
context:
space:
mode:
authormogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-11 02:12:27 +0000
committermogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-11 02:12:27 +0000
commitd1557a9c08663da3017ca3ed3c5bbfe9660551db (patch)
tree5253b808f2c774a7576514283606b636a2562c2b /main/logger.c
parentcd1b5fdda1dcbe5d8d26ff3c63565d31f7f7ea56 (diff)
safe terminal output is sweet.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47491 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/logger.c')
-rw-r--r--main/logger.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/main/logger.c b/main/logger.c
index 95a768dbd..660fb2f74 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -716,8 +716,10 @@ void ast_log(int level, const char *file, int line, const char *function, const
va_start(ap, fmt);
res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
va_end(ap);
- if (res != AST_DYNSTR_BUILD_FAILED)
+ if (res != AST_DYNSTR_BUILD_FAILED) {
+ term_filter_escapes(buf->str);
fputs(buf->str, stdout);
+ }
}
return;
}
@@ -781,7 +783,8 @@ void ast_log(int level, const char *file, int line, const char *function, const
term_color(tmp2, file, COLOR_BRWHITE, 0, sizeof(tmp2)),
term_color(tmp3, linestr, COLOR_BRWHITE, 0, sizeof(tmp3)),
term_color(tmp4, function, COLOR_BRWHITE, 0, sizeof(tmp4)));
-
+ /*filter to the console!*/
+ term_filter_escapes(buf->str);
ast_console_puts_mutable(buf->str);
va_start(ap, fmt);
@@ -892,6 +895,9 @@ void ast_verbose(const char *fmt, ...)
if (res == AST_DYNSTR_BUILD_FAILED)
return;
+
+ /* filter out possibly hazardous escape sequences */
+ term_filter_escapes(buf->str);
AST_LIST_LOCK(&verbosers);
AST_LIST_TRAVERSE(&verbosers, v, list)