root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Bernd Edlinger 2020-05-31 07:51:23 +02:00
parent c7f837cfcc
commit 41dccd68b9
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bio/b_print.c
View File

@ -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;
}

33
test/bioprinttest.c
View File

@ -241,48 +241,15 @@ static int test_fp(int i)
return r;
}
extern double zero_value;
double zero_value = 0.0;
static int test_big(void)
{
char buf[80];
double d, z, inf, nan;
/* Test excessively big number. Should fail */
if (!TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f\n", 2 * (double)ULONG_MAX), -1))
return 0;
d = 1.0;
z = zero_value;
inf = d / z;
nan = z / z;
/*
* Test +/-inf, nan. Should fail.
* Test +/-1.0, +/-0.0. Should work.
*/
if (!TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", inf), -1)
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", -inf), -1)
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", nan), -1)
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", d), 8)
|| !TEST_str_eq(buf, "1.000000")
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", z), 8)
|| !TEST_str_eq(buf, "0.000000")
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", -d), 9)
|| !TEST_str_eq(buf, "-1.000000")
|| !TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
"%f", -z), 8)
|| !TEST_str_eq(buf, "0.000000"))
return 0;
return 1;
}