diff options
author | Werner Koch <wk@gnupg.org> | 2002-06-26 12:51:15 +0000 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2002-06-26 12:51:15 +0000 |
commit | f874380c2f206bb2150798106e2b348723fe9451 (patch) | |
tree | 1cabc305437667a2ac80c1a52c1633e332c889b2 /src/assuan-buffer.c | |
parent | 1e45cc2fb3618cdfcb0b790d563201c6ecb16334 (diff) | |
download | libassuan-f874380c2f206bb2150798106e2b348723fe9451.tar.gz |
* assuan-buffer.c (assuan_write_line): Make sure we never
accidently print an extra LF.
Diffstat (limited to 'src/assuan-buffer.c')
-rw-r--r-- | src/assuan-buffer.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c index da6b201..4509f74 100644 --- a/src/assuan-buffer.c +++ b/src/assuan-buffer.c @@ -241,23 +241,31 @@ AssuanError assuan_write_line (ASSUAN_CONTEXT ctx, const char *line ) { int rc; - + size_t len; + const char *s; + if (!ctx) return ASSUAN_Invalid_Value; - /* fixme: we should do some kind of line buffering */ + /* Make sure that we never take a LF from the user - this might + violate the protocol. */ + s = strchr (line, '\n'); + len = s? (s-line) : strlen (line); + + /* fixme: we should do some kind of line buffering. */ if (ctx->log_fp) { fprintf (ctx->log_fp, "%s[%p] -> ", my_log_prefix (), ctx); + if (s) + fputs ("[supplied line contained a LF]", ctx->log_fp); if (ctx->confidential) fputs ("[Confidential data not shown]", ctx->log_fp); else - _assuan_log_print_buffer (ctx->log_fp, - line, strlen (line)); + _assuan_log_print_buffer (ctx->log_fp, line, len); putc ('\n', ctx->log_fp); } - rc = writen (ctx->outbound.fd, line, strlen(line)); + rc = writen (ctx->outbound.fd, line, len); if (rc) rc = ASSUAN_Write_Error; if (!rc) |