mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 08:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #940 from dxbjavid/get-int64-double-boundary

Browse Source 
reject out-of-range double in json_object_get_int64/get_uint64
This commit is contained in:
Eric Hawicz
2026-07-12 19:46:03 -04:00
committed by GitHub
parent aab792578b 16e394ba96
commit e65444a258
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json_object.c
+8 -6
View File
@@ -996,9 +996,10 @@ int64_t json_object_get_int64(const struct json_object *jso)
}
}
case json_type_double:
// INT64_MAX can't be exactly represented as a double
// so cast to tell the compiler it's ok to round up.
if (JC_DOUBLE_C(jso)->c_double > (double)INT64_MAX)
// INT64_MAX can't be exactly represented as a double, so it
// rounds up to (double)(INT64_MAX+1). Use >= so that value is
// rejected rather than cast to int64_t, which would be UB.
if (JC_DOUBLE_C(jso)->c_double >= (double)INT64_MAX)
{
errno = ERANGE;
return INT64_MAX;
@@ -1049,9 +1050,10 @@ uint64_t json_object_get_uint64(const struct json_object *jso)
}
}
case json_type_double:
// UINT64_MAX can't be exactly represented as a double
// so cast to tell the compiler it's ok to round up.
if (JC_DOUBLE_C(jso)->c_double > (double)UINT64_MAX)
// UINT64_MAX can't be exactly represented as a double, so it
// rounds up to (double)(UINT64_MAX+1). Use >= so that value is
// rejected rather than cast to uint64_t, which would be UB.
if (JC_DOUBLE_C(jso)->c_double >= (double)UINT64_MAX)
{
errno = ERANGE;
return UINT64_MAX;
tests/test_int_get.c
+4
View File
@@ -65,6 +65,8 @@ int main(int argc, char **argv)
CHECK_GET_INT64(N_DBL(INFINITY), INT64_MAX && errno == ERANGE);
CHECK_GET_INT64(N_DBL(-INFINITY), INT64_MIN && errno == ERANGE);
CHECK_GET_INT64(N_DBL(NAN), INT64_MIN && errno == EINVAL);
// (double)INT64_MAX rounds up to 2^63, which is one past INT64_MAX
CHECK_GET_INT64(N_DBL(9223372036854775808.0), INT64_MAX && errno == ERANGE);
printf("INT64 GET PASSED\n");
CHECK_GET_UINT64(N_U64(UINT64_MAX), UINT64_MAX && errno == 0);
@@ -73,6 +75,8 @@ int main(int argc, char **argv)
CHECK_GET_UINT64(N_DBL(INFINITY), UINT64_MAX && errno == ERANGE);
CHECK_GET_UINT64(N_DBL(-INFINITY), 0 && errno == ERANGE);
CHECK_GET_UINT64(N_DBL(NAN), 0 && errno == EINVAL);
// (double)UINT64_MAX rounds up to 2^64, which is one past UINT64_MAX
CHECK_GET_UINT64(N_DBL(18446744073709551616.0), UINT64_MAX && errno == ERANGE);
printf("UINT64 GET PASSED\n");
printf("PASSED\n");