Skip to content

Fix: -Wfloat-conversion error in print_number on MinGW #1061

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

Open
coveyjorjet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: -Wfloat-conversion error in print_number on MinGW #1061

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
10 changes: 1 addition & 9 deletions cJSON.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,6 @@
#endif
#define false ((cJSON_bool)0)

/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */
#ifndef isinf
#define isinf(d) (isnan((d - d)) && !isnan(d))
#endif
#ifndef isnan
#define isnan(d) (d != d)
#endif

#ifndef NAN
#ifdef _WIN32
#define NAN sqrt(-1.0)
Expand Down Expand Up @@ -609,7 +601,7 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out
}

/* This checks for NaN and Infinity */
if (isnan(d) || isinf(d))
if ((d != d) || (d > DBL_MAX) || (d < -DBL_MAX))
{
length = sprintf((char*)number_buffer, "null");
}
Expand Down