Skip to content

json: fix signed integer overflows #3016

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

json: fix signed integer overflows #3016

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
18 changes: 18 additions & 0 deletions src/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const struct _json_value json_value_none;
#include <string.h>
#include <ctype.h>
#include <math.h>
#include <limits.h>

typedef unsigned int json_uchar;

Expand Down Expand Up @@ -758,14 +759,31 @@ json_value * json_parse_ex (json_settings * settings,
else
{
flags |= flag_num_e_got_sign;
/* Overflow check for exponent */
if (num_e > (LONG_MAX / 10) || (num_e == (LONG_MAX / 10) && (b - '0') > (LONG_MAX % 10))) {
sprintf(error, "%d:%d: Exponent too large (overflow)", line_and_col);
goto e_failed;
}
num_e = (num_e * 10) + (b - '0');
continue;
}

/* Overflow check for integer */
long prev = top->u.integer;
if ((prev > 0 && (prev > (LONG_MAX / 10) || (prev == (LONG_MAX / 10) && (b - '0') > (LONG_MAX % 10)))) ||
(prev < 0 && (prev < (LONG_MIN / 10) || (prev == (LONG_MIN / 10) && -(b - '0') < (LONG_MIN % 10))))) {
sprintf(error, "%d:%d: Integer too large (overflow)", line_and_col);
goto e_failed;
}
top->u.integer = (top->u.integer * 10) + (b - '0');
continue;
}

/* Overflow check for fraction */
if (num_fraction > (LONG_MAX / 10) || (num_fraction == (LONG_MAX / 10) && (b - '0') > (LONG_MAX % 10))) {
sprintf(error, "%d:%d: Fraction too large (overflow)", line_and_col);
goto e_failed;
}
num_fraction = (num_fraction * 10) + (b - '0');
continue;
}
Expand Down