mirror/ ultrajson
1
0
Fork 0
mirror of https://github.com/ultrajson/ultrajson.git synced 2024-05-19 17:36:22 +02:00
Code Issues

fix: use allow_nan to select static variable to ensure overflow err

This commit is contained in:
eritque0arcus 2024-04-29 07:56:24 -04:00
parent de8602a320
commit 54ca1de4d9
No known key found for this signature in database
GPG Key ID: B95AA12EA8C8C3AE
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dconv_wrapper.cc
View File

@ -28,11 +28,20 @@ namespace double_conversion
{
int dconv_d2s(double value, char* buf, int buflen, int* strlength, int allow_nan)
{
static DoubleToStringConverter d2s(DCONV_D2S_EMIT_TRAILING_DECIMAL_POINT | DCONV_D2S_EMIT_TRAILING_ZERO_AFTER_POINT | DCONV_D2S_EMIT_POSITIVE_EXPONENT_SIGN,
"Infinity", "NaN", 'e', DCONV_DECIMAL_IN_SHORTEST_LOW, DCONV_DECIMAL_IN_SHORTEST_HIGH, 0, 0);
DoubleToStringConverter* d2s;
if(allow_nan){
static DoubleToStringConverter d2s_w_nan(DCONV_D2S_EMIT_TRAILING_DECIMAL_POINT | DCONV_D2S_EMIT_TRAILING_ZERO_AFTER_POINT | DCONV_D2S_EMIT_POSITIVE_EXPONENT_SIGN,
"Infinity", "NaN", 'e', DCONV_DECIMAL_IN_SHORTEST_LOW, DCONV_DECIMAL_IN_SHORTEST_HIGH, 0, 0);
d2s = &d2s_w_nan;
}else{
static DoubleToStringConverter d2s_wo_nan(DCONV_D2S_EMIT_TRAILING_DECIMAL_POINT | DCONV_D2S_EMIT_TRAILING_ZERO_AFTER_POINT | DCONV_D2S_EMIT_POSITIVE_EXPONENT_SIGN,
NULL, NULL, 'e', DCONV_DECIMAL_IN_SHORTEST_LOW, DCONV_DECIMAL_IN_SHORTEST_HIGH, 0, 0);
d2s = &d2s_wo_nan;
}
StringBuilder sb(buf, buflen);
int success = static_cast<int>(d2s.ToShortest(value, &sb));
success = success && (!allow_nan || ((strcmp(buf, "NaN") != 0 && strcmp(buf, "Infinity") != 0 && strcmp(buf, "-Infinity") != 0)));
int success = static_cast<int>(d2s->ToShortest(value, &sb));
*strlength = success ? sb.position() : -1;
return success;
}