generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d029db10: am ba09edcb: Merge "Fix nan output in the printf family."

Browse Source 
* commit 'd029db10526c2091acfe940d7d008019a309c47c':
  Fix nan output in the printf family.
This commit is contained in:
Elliott Hughes
2014-12-21 06:30:39 +00:00
committed by Android Git Automerger
parent 598f86661d d029db1052
commit 77707a3d4f
3 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libc/upstream-openbsd/lib/libc/stdio/vfprintf.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: vfprintf.c,v 1.66 2014/05/03 12:36:45 deraadt Exp $ */ /* $OpenBSD: vfprintf.c,v 1.67 2014/12/21 00:23:30 daniel Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
@@ -753,10 +753,9 @@ fp_common:
if (signflag) if (signflag)
sign = '-'; sign = '-';
if (expt == INT_MAX) { /* inf or nan */ if (expt == INT_MAX) { /* inf or nan */
if (*cp == 'N') { if (*cp == 'N')
cp = (ch >= 'a') ? "nan" : "NAN"; cp = (ch >= 'a') ? "nan" : "NAN";
sign = '\0'; else
} else
cp = (ch >= 'a') ? "inf" : "INF"; cp = (ch >= 'a') ? "inf" : "INF";
size = 3; size = 3;
flags &= ~ZEROPAD; flags &= ~ZEROPAD;

7
libc/upstream-openbsd/lib/libc/stdio/vfwprintf.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: vfwprintf.c,v 1.11 2014/06/04 07:45:25 stsp Exp $ */ /* $OpenBSD: vfwprintf.c,v 1.12 2014/12/21 00:23:30 daniel Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
@@ -731,10 +731,9 @@ fp_common:
if (signflag) if (signflag)
sign = '-'; sign = '-';
if (expt == INT_MAX) { /* inf or nan */ if (expt == INT_MAX) { /* inf or nan */
if (*cp == 'N') { if (*cp == 'N')
cp = (ch >= 'a') ? L"nan" : L"NAN"; cp = (ch >= 'a') ? L"nan" : L"NAN";
sign = '\0'; else
} else
cp = (ch >= 'a') ? L"inf" : L"INF"; cp = (ch >= 'a') ? L"inf" : L"INF";
size = 3; size = 3;
flags &= ~ZEROPAD; flags &= ~ZEROPAD;

68
tests/stdio_test.cpp
View File

@@ -364,22 +364,52 @@ TEST(stdio, snprintf_smoke) {
EXPECT_STREQ("print_me_twice print_me_twice", buf); EXPECT_STREQ("print_me_twice print_me_twice", buf);
} }
TEST(stdio, snprintf_f_special) { template <typename T>
char buf[BUFSIZ]; void CheckInfNan(int snprintf_fn(T*, size_t, const T*, ...),
snprintf(buf, sizeof(buf), "%f", nanf("")); const T* fmt, const T* fmt_plus,
EXPECT_STRCASEEQ("NaN", buf); const T* minus_inf, const T* inf_, const T* plus_inf,
const T* minus_nan, const T* nan_, const T* plus_nan) {
T buf[BUFSIZ];
snprintf(buf, sizeof(buf), "%f", HUGE_VALF); snprintf_fn(buf, sizeof(buf), fmt, nan(""));
EXPECT_STRCASEEQ("Inf", buf); EXPECT_STREQ(nan_, buf) << fmt;
snprintf_fn(buf, sizeof(buf), fmt, -nan(""));
EXPECT_STREQ(minus_nan, buf) << fmt;
snprintf_fn(buf, sizeof(buf), fmt_plus, nan(""));
EXPECT_STREQ(plus_nan, buf) << fmt_plus;
snprintf_fn(buf, sizeof(buf), fmt_plus, -nan(""));
EXPECT_STREQ(minus_nan, buf) << fmt_plus;
snprintf_fn(buf, sizeof(buf), fmt, HUGE_VAL);
EXPECT_STREQ(inf_, buf) << fmt;
snprintf_fn(buf, sizeof(buf), fmt, -HUGE_VAL);
EXPECT_STREQ(minus_inf, buf) << fmt;
snprintf_fn(buf, sizeof(buf), fmt_plus, HUGE_VAL);
EXPECT_STREQ(plus_inf, buf) << fmt_plus;
snprintf_fn(buf, sizeof(buf), fmt_plus, -HUGE_VAL);
EXPECT_STREQ(minus_inf, buf) << fmt_plus;
} }
TEST(stdio, snprintf_g_special) { TEST(stdio, snprintf_inf_nan) {
char buf[BUFSIZ]; CheckInfNan(snprintf, "%a", "%+a", "-inf", "inf", "+inf", "-nan", "nan", "+nan");
snprintf(buf, sizeof(buf), "%g", nan("")); CheckInfNan(snprintf, "%A", "%+A", "-INF", "INF", "+INF", "-NAN", "NAN", "+NAN");
EXPECT_STRCASEEQ("NaN", buf); CheckInfNan(snprintf, "%e", "%+e", "-inf", "inf", "+inf", "-nan", "nan", "+nan");
CheckInfNan(snprintf, "%E", "%+E", "-INF", "INF", "+INF", "-NAN", "NAN", "+NAN");
CheckInfNan(snprintf, "%f", "%+f", "-inf", "inf", "+inf", "-nan", "nan", "+nan");
CheckInfNan(snprintf, "%F", "%+F", "-INF", "INF", "+INF", "-NAN", "NAN", "+NAN");
CheckInfNan(snprintf, "%g", "%+g", "-inf", "inf", "+inf", "-nan", "nan", "+nan");
CheckInfNan(snprintf, "%G", "%+G", "-INF", "INF", "+INF", "-NAN", "NAN", "+NAN");
}
snprintf(buf, sizeof(buf), "%g", HUGE_VAL); TEST(stdio, wsprintf_inf_nan) {
EXPECT_STRCASEEQ("Inf", buf); CheckInfNan(swprintf, L"%a", L"%+a", L"-inf", L"inf", L"+inf", L"-nan", L"nan", L"+nan");
CheckInfNan(swprintf, L"%A", L"%+A", L"-INF", L"INF", L"+INF", L"-NAN", L"NAN", L"+NAN");
CheckInfNan(swprintf, L"%e", L"%+e", L"-inf", L"inf", L"+inf", L"-nan", L"nan", L"+nan");
CheckInfNan(swprintf, L"%E", L"%+E", L"-INF", L"INF", L"+INF", L"-NAN", L"NAN", L"+NAN");
CheckInfNan(swprintf, L"%f", L"%+f", L"-inf", L"inf", L"+inf", L"-nan", L"nan", L"+nan");
CheckInfNan(swprintf, L"%F", L"%+F", L"-INF", L"INF", L"+INF", L"-NAN", L"NAN", L"+NAN");
CheckInfNan(swprintf, L"%g", L"%+g", L"-inf", L"inf", L"+inf", L"-nan", L"nan", L"+nan");
CheckInfNan(swprintf, L"%G", L"%+G", L"-INF", L"INF", L"+INF", L"-NAN", L"NAN", L"+NAN");
} }
TEST(stdio, snprintf_d_INT_MAX) { TEST(stdio, snprintf_d_INT_MAX) {
@@ -439,8 +469,22 @@ TEST(stdio, snprintf_e) {
TEST(stdio, snprintf_negative_zero_5084292) { TEST(stdio, snprintf_negative_zero_5084292) {
char buf[BUFSIZ]; char buf[BUFSIZ];
snprintf(buf, sizeof(buf), "%e", -0.0);
EXPECT_STREQ("-0.000000e+00", buf);
snprintf(buf, sizeof(buf), "%E", -0.0);
EXPECT_STREQ("-0.000000E+00", buf);
snprintf(buf, sizeof(buf), "%f", -0.0); snprintf(buf, sizeof(buf), "%f", -0.0);
EXPECT_STREQ("-0.000000", buf); EXPECT_STREQ("-0.000000", buf);
snprintf(buf, sizeof(buf), "%F", -0.0);
EXPECT_STREQ("-0.000000", buf);
snprintf(buf, sizeof(buf), "%g", -0.0);
EXPECT_STREQ("-0", buf);
snprintf(buf, sizeof(buf), "%G", -0.0);
EXPECT_STREQ("-0", buf);
snprintf(buf, sizeof(buf), "%a", -0.0);
EXPECT_STREQ("-0x0p+0", buf);
snprintf(buf, sizeof(buf), "%A", -0.0);
EXPECT_STREQ("-0X0P+0", buf);
} }
TEST(stdio, snprintf_utf8_15439554) { TEST(stdio, snprintf_utf8_15439554) {