diff options
author | Matt Caswell <matt@openssl.org> | 2016-06-03 15:53:54 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-06-03 20:31:24 +0100 |
commit | 96f1de5bf40af27db3df91c106d799fa86165eb9 (patch) | |
tree | 3e348bd58a86ea8b843a587c3293c4150baacd63 | |
parent | f3cab0b11ffd1e1816f34a2880493ff1a3313f49 (diff) |
BIO_printf() can fail to print the last character
If the string to print is exactly 2048 character long (excluding the NULL
terminator) then BIO_printf will chop off the last byte. This is because
it has filled its static buffer but hasn't yet allocated a dynamic buffer.
In cases where we don't have a dynamic buffer we need to truncate but that
is not the case for BIO_printf(). We need to check whether we are able to
have a dynamic buffer buffer deciding to truncate.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r-- | crypto/bio/b_print.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index 90248fa2aa..987fe068c6 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -423,9 +423,15 @@ _dopr(char **sbuffer, break; } } - *truncated = (currlen > *maxlen - 1); - if (*truncated) - currlen = *maxlen - 1; + /* + * We have to truncate if there is no dynamic buffer and we have filled the + * static buffer. + */ + if (buffer == NULL) { + *truncated = (currlen > *maxlen - 1); + if (*truncated) + currlen = *maxlen - 1; + } if(!doapr_outch(sbuffer, buffer, &currlen, maxlen, '\0')) return 0; *retlen = currlen - 1; |