Skip to content

bugfix: handle overflow when decoding numbers. #127

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
chernetskyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bugfix: handle overflow when decoding numbers. #127

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
12 changes: 9 additions & 3 deletions lua_cjson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*/

#include <assert.h>
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -1585,9 +1586,14 @@ static int json_is_invalid_number(json_parse_t *json)
static void json_next_number_token(json_parse_t *json, json_token_t *token)
{
char *endptr;
long long tmpval = strtoll(json->ptr, &endptr, 10);
if (json->ptr == endptr || *endptr == '.' || *endptr == 'e' ||
*endptr == 'E' || *endptr == 'x') {
long long tmpval;

errno = 0;
tmpval = strtoll(json->ptr, &endptr, 10);
/* Reparse overflowing integers as doubles instead of using the
* saturated value returned by strtoll(). */
if (errno == ERANGE || json->ptr == endptr || *endptr == '.' ||
*endptr == 'e' || *endptr == 'E' || *endptr == 'x') {
token->type = T_NUMBER;
token->value.number = fpconv_strtod(json->ptr, &endptr);
if (json->ptr == endptr) {
Expand Down
9 changes: 9 additions & 0 deletions tests/test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ local cjson_tests = {
{ "Decode numbers",
json.decode, { '[ 0.0, -5e3, -1, 0.3e-3, 1023.2, 0e10 ]' },
true, { { 0.0, -5000, -1, 0.0003, 1023.2, 0 } } },
{ "Decode positive integer overflow as a number",
json.decode, { '100000000000000000000' },
true, { 1e20 } },
{ "Decode negative integer overflow as a number",
json.decode, { '-100000000000000000000' },
true, { -1e20 } },
{ "Decode integers following overflowing numbers",
json.decode, { '[ 100000000000000000000, 42, -100000000000000000000, -42 ]' },
true, { { 1e20, 42, -1e20, -42 } } },
{ "Decode null",
json.decode, { 'null' }, true, { json.null } },
{ "Decode true",
Expand Down