diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2020-05-31 07:51:23 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2020-06-01 18:20:28 +0200 |
| commit | 41dccd68b9b9b7622b26d264c5fa190aa5bd4201 (patch) | |
| tree | 9e408ca3dbfaaf20350f6020a5b6e2f4adbf6123 /crypto/bio/b_print.c | |
| parent | undeprecate SSL_CTX_load_verify_locations and X509_STORE_load_locations (diff) | |
| download | openssl-41dccd68b9b9b7622b26d264c5fa190aa5bd4201.tar.xz openssl-41dccd68b9b9b7622b26d264c5fa190aa5bd4201.zip | |
Revert the check for NaN in %f format
Unfortunately -Ofast seems to break that check.
Fixes #11994
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12003)
Diffstat (limited to 'crypto/bio/b_print.c')
| -rw-r--r-- | crypto/bio/b_print.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index 6b995f8233..a5dfff503c 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -638,10 +638,8 @@ fmtfp(char **sbuffer, /* * By subtracting 65535 (2^16-1) we cancel the low order 15 bits * of ULONG_MAX to avoid using imprecise floating point values. - * The second condition is necessary to catch NaN values. */ - if (ufvalue >= (double)(ULONG_MAX - 65535) + 65536.0 - || !(ufvalue == ufvalue) /* NaN */) { + if (ufvalue >= (double)(ULONG_MAX - 65535) + 65536.0) { /* Number too big */ return 0; } |