diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-16 18:53:52 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-16 18:56:17 +0000 |
| commit | 84c2524e855dd0ccd27724e54e6cf09fb2419d86 (patch) | |
| tree | 5f4a63ecab9dcef6ebde632e9c8555511c1946b6 /contrib/libucl | |
| parent | fe41f43de4bea57b93689c132bce4dcbb3cbb524 (diff) | |
| download | rspamd-84c2524e855dd0ccd27724e54e6cf09fb2419d86.tar.gz rspamd-84c2524e855dd0ccd27724e54e6cf09fb2419d86.zip | |
[Fix] Deal with nan and inf encoding in json/ucl
Diffstat (limited to 'contrib/libucl')
| -rw-r--r-- | contrib/libucl/ucl_emitter_utils.c | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/contrib/libucl/ucl_emitter_utils.c b/contrib/libucl/ucl_emitter_utils.c index 3559eb63d..6c46a8e49 100644 --- a/contrib/libucl/ucl_emitter_utils.c +++ b/contrib/libucl/ucl_emitter_utils.c @@ -207,15 +207,18 @@ ucl_utstring_append_double (double val, void *ud) UT_string *buf = ud; const double delta = 0.0000001; - if (val == (double)(int)val) { - utstring_printf (buf, "%.1lf", val); - } - else if (fabs (val - (double)(int)val) < delta) { - /* Write at maximum precision */ - utstring_printf (buf, "%.*lg", DBL_DIG, val); + if (isfinite (val)) { + if (val == (double) (int) val) { + utstring_printf (buf, "%.1lf", val); + } else if (fabs (val - (double) (int) val) < delta) { + /* Write at maximum precision */ + utstring_printf (buf, "%.*lg", DBL_DIG, val); + } else { + utstring_printf (buf, "%lf", val); + } } else { - utstring_printf (buf, "%lf", val); + utstring_append_len (buf, "null", 5); } return 0; @@ -262,15 +265,19 @@ ucl_file_append_double (double val, void *ud) FILE *fp = ud; const double delta = 0.0000001; - if (val == (double)(int)val) { - fprintf (fp, "%.1lf", val); - } - else if (fabs (val - (double)(int)val) < delta) { - /* Write at maximum precision */ - fprintf (fp, "%.*lg", DBL_DIG, val); + if (isfinite (val)) { + if (val == (double) (int) val) { + fprintf (fp, "%.1lf", val); + } else if (fabs (val - (double) (int) val) < delta) { + /* Write at maximum precision */ + fprintf (fp, "%.*lg", DBL_DIG, val); + } else { + fprintf (fp, "%lf", val); + } } else { - fprintf (fp, "%lf", val); + /* Encode as null */ + fprintf (fp, "null"); } return 0; @@ -336,15 +343,18 @@ ucl_fd_append_double (double val, void *ud) const double delta = 0.0000001; char nbuf[64]; - if (val == (double)(int)val) { - snprintf (nbuf, sizeof (nbuf), "%.1lf", val); - } - else if (fabs (val - (double)(int)val) < delta) { - /* Write at maximum precision */ - snprintf (nbuf, sizeof (nbuf), "%.*lg", DBL_DIG, val); + if (isfinite (val)) { + if (val == (double) (int) val) { + snprintf (nbuf, sizeof (nbuf), "%.1lf", val); + } else if (fabs (val - (double) (int) val) < delta) { + /* Write at maximum precision */ + snprintf (nbuf, sizeof (nbuf), "%.*lg", DBL_DIG, val); + } else { + snprintf (nbuf, sizeof (nbuf), "%lf", val); + } } else { - snprintf (nbuf, sizeof (nbuf), "%lf", val); + memcpy (nbuf, "null", 5); } return write (fd, nbuf, strlen (nbuf)); |