summaryrefslogtreecommitdiffstats
path: root/crypto/bio
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-13 19:10:22 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-13 21:14:07 +0100
commitf11a023adaae8ba037f952fd72dfbcc34733c993 (patch)
tree88d42389388639e8ab7286fe2141d77dda5a659c /crypto/bio
parent9b7e82f8d939ca6894f941268b219da55f069b26 (diff)
VMS: for testutil, make sure to use BIO_f_linebuffer
Without that, output comes one character per line. It's the same issue as has been observed before, this happens when using write() on a record oriented stream (possibly unbuffered too). This also uncovered a bug in BIO_f_linebuffer, where this would cause an error: BIO_write(bio, "1\n", 1); I.e. there's a \n just after the part of the string that we currently ask to get written. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5352)
Diffstat (limited to 'crypto/bio')
-rw-r--r--crypto/bio/bf_lbuf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 812ed3f452..2a4d1e698b 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -120,9 +120,10 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
do {
const char *p;
+ char c;
- for (p = in; p < in + inl && *p != '\n'; p++) ;
- if (*p == '\n') {
+ for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++) ;
+ if (c == '\n') {
p++;
foundnl = 1;
} else