Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix printf-family functions on long double inf #1273

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Fix printf-family functions on long double inf #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions libc/stdio/fmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ static void __fmt_ldfpbits(union U *u, struct FPBits *b) {
#if LDBL_MANT_DIG == 113
b->bits[3] |= 1 << (112 - 32 * 3); // set lowest exponent bit
#endif
} else if (b->bits[0] | b->bits[1] | b->bits[2] | b->bits[3]) {
} else if (isnan(u->ld)) {
i = STRTOG_NaN;
} else {
i = STRTOG_Infinite;
Expand Down Expand Up @@ -1145,8 +1145,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va, int *wrote) {
s = s0 =
gdtoa(fpb.fpi, fpb.ex, fpb.bits, &fpb.kind, 3, prec, &decpt, &se);
}
if (decpt == 9999) {
Format9999:
if (decpt == 9999 || decpt == -32768) {
FormatDecpt9999Or32768:
if (s0)
freedtoa(s0);
bzero(special, sizeof(special));
Expand Down Expand Up @@ -1258,8 +1258,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va, int *wrote) {
s = s0 = gdtoa(fpb.fpi, fpb.ex, fpb.bits, &fpb.kind, prec ? 2 : 0,
prec, &decpt, &se);
}
if (decpt == 9999)
goto Format9999;
if (decpt == 9999 || decpt == -32768)
goto FormatDecpt9999Or32768;
c = se - s;
prec1 = prec;
if (!prec) {
Expand Down Expand Up @@ -1304,8 +1304,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va, int *wrote) {
s = s0 = gdtoa(fpb.fpi, fpb.ex, fpb.bits, &fpb.kind, prec ? 2 : 0,
prec, &decpt, &se);
}
if (decpt == 9999)
goto Format9999;
if (decpt == 9999 || decpt == -32768)
goto FormatDecpt9999Or32768;
FormatExpo:
if (fpb.sign /* && (x || sign) */)
sign = '-';
Expand Down Expand Up @@ -1386,7 +1386,7 @@ int __fmt(void *fn, void *arg, const char *format, va_list va, int *wrote) {
}
if (fpb.kind == STRTOG_Infinite || fpb.kind == STRTOG_NaN) {
s0 = 0;
goto Format9999;
goto FormatDecpt9999Or32768;
}
prec1 = __fmt_fpiprec(&fpb);
if ((flags & FLAGS_PRECISION) && prec < prec1) {
Expand Down
36 changes: 36 additions & 0 deletions test/libc/stdio/snprintf_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,39 @@ TEST(snprintf, testPlusFlagOnChar) {
ASSERT_EQ(i, 1);
ASSERT_STREQ(buf, "=");
}

TEST(snprintf, testInf) {
char buf[10] = {};
int i = snprintf(buf, sizeof(buf), "%f", 1.0 / 0.0);

ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

memset(buf, 0, 4);
i = snprintf(buf, sizeof(buf), "%Lf", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

memset(buf, 0, 4);
i = snprintf(buf, sizeof(buf), "%e", 1.0 / 0.0);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

memset(buf, 0, 4);
i = snprintf(buf, sizeof(buf), "%Le", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

memset(buf, 0, 4);
i = snprintf(buf, sizeof(buf), "%g", 1.0 / 0.0);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

memset(buf, 0, 4);
i = snprintf(buf, sizeof(buf), "%Lg", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");

for (i = 4; i < 10; ++i)
ASSERT_EQ(buf[i], '\0');
}
Loading